Packman Build Service PMBS

flacon.changes Changed

flacon.spec Changed

flacon-5.0.0.tar.gz/tests/data/testConvert/05.cuecreator.cue Deleted

flacon-5.0.0.tar.gz/tests/data/testConvert/05.expected.cue Deleted

flacon-5.0.0.tar.gz/tests/data/testConvert/06.expected.cue Deleted

flacon-5.0.0.tar.gz/tests/data/testConvert/07.path(with.symbols and space ) Deleted

flacon-5.0.0.tar.gz/.travis.yml -> flacon-5.1.0.tar.gz/.travis.yml Changed

flacon-5.1.0.tar.gz/.tx/stat.sh Added

flacon-5.0.0.tar.gz/CMakeLists.txt -> flacon-5.1.0.tar.gz/CMakeLists.txt Changed

flacon-5.0.0.tar.gz/converter/converter.cpp -> flacon-5.1.0.tar.gz/converter/converter.cpp Changed

@@ -69,7 +69,28 @@
  ************************************************/
 void Converter::start()
 {
-    if (project->count() == 0)
+    Jobs jobs;
+    for (int d=0; d<project->count(); ++d)
+    {
+        Job job;
+        job.disk = project->disk(d);
+
+        for (int t=0; t<job.disk->count(); ++t)
+            job.tracks << job.disk->track(t);
+
+        jobs << job;
+    }
+
+    start(jobs);
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void Converter::start(const Converter::Jobs &jobs)
+{
+    if (jobs.isEmpty())
     {
         emit finished();
         return;
@@ -88,30 +109,33 @@
     if (!ok || mThreadCount < 1)
         mThreadCount = qMax(6, QThread::idealThreadCount());
 
-    for (int i=0; i<project->count(); ++i)
+    for (const Job &job: jobs)
     {
-        if (project->disk(i)->canConvert())
-        {
-            DiskPipeline * pipeline = new DiskPipeline(project->disk(i), this);
+        if (job.tracks.isEmpty())
+            continue;
 
-            connect(pipeline, SIGNAL(readyStart()),
-                    this, SLOT(startThread()));
+        if (!job.disk->canConvert())
+            continue;
 
-            connect(pipeline, SIGNAL(threadFinished()),
-                    this, SLOT(startThread()));
+        DiskPipeline * pipeline = new DiskPipeline(job, this);
 
-            connect(pipeline, &DiskPipeline::trackProgressChanged,
-                    this, &Converter::trackProgress);
+        connect(pipeline, SIGNAL(readyStart()),
+                this, SLOT(startThread()));
 
-            mDiskPiplines << pipeline;
+        connect(pipeline, SIGNAL(threadFinished()),
+                this, SLOT(startThread()));
 
-            if (!pipeline->init())
-            {
-                qDeleteAll(mDiskPiplines);
-                mDiskPiplines.clear();
-                emit finished();
-                return;
-            }
+        connect(pipeline, &DiskPipeline::trackProgressChanged,
+                this, &Converter::trackProgress);
+
+        mDiskPiplines << pipeline;
+
+        if (!pipeline->init())
+        {
+            qDeleteAll(mDiskPiplines);
+            mDiskPiplines.clear();
+            emit finished();
+            return;
         }
     }

flacon-5.0.0.tar.gz/converter/converter.h -> flacon-5.1.0.tar.gz/converter/converter.h Changed

flacon-5.0.0.tar.gz/converter/cuecreator.cpp -> flacon-5.1.0.tar.gz/converter/cuecreator.cpp Changed

@@ -26,11 +26,13 @@
 
 #include "cuecreator.h"
 #include "disk.h"
+#include "settings.h"
 
 #include <QFileInfo>
 #include <QTextCodec>
 #include <QDir>
 
+
 /************************************************
 
  ************************************************/
@@ -39,10 +41,20 @@
     mPreGapType(preGapType)
 {
     Track *track = mDisk->track(0);
-    QString fileName = QFileInfo(track->resultFilePath()).dir().absolutePath() + QDir::separator() +
-            Disk::safeString(QString("%1-%2.cue").arg(track->artist(), track->album()));
-
-    mFile.setFileName(fileName);
+    QString dir = QFileInfo(track->resultFilePath()).dir().absolutePath();
+    QString fileName = safeString(expandPattern(settings->value(Settings::PerTrackCue_FileName).toString(),
+                                     mDisk->count(),
+                                     0,
+                                     track->album(),
+                                     track->title(),
+                                     track->artist(),
+                                     track->genre(),
+                                     track->date()));
+
+    if (!fileName.endsWith(".cue"))
+        fileName += ".cue";
+
+    mFile.setFileName(dir + QDir::separator() + fileName);
     setTextCodecName("UTF-8");
 }

flacon-5.0.0.tar.gz/converter/diskpipline.cpp -> flacon-5.1.0.tar.gz/converter/diskpipline.cpp Changed

@@ -90,16 +90,15 @@
 public:
     Data():
         pipeline(nullptr),
-        disk(nullptr),
         needStartSplitter(true),
         interrupted(false),
-        preGapType(PreGapType::Skip)
+        preGapType(PreGapType::Skip),
+        extractPregap(false)
     {
     }
 
     DiskPipeline *pipeline;
-    const Disk *disk;
-    QList<const Track*> tracks;
+    Converter::Job job;
     bool needStartSplitter;
     QHash<const Track*, TrackState> trackStates;
     QList<EncoderRequest> encoderRequests;
@@ -108,7 +107,8 @@
     QString workDir;
     QString tmpFilePrefix;
     PreGapType preGapType;
-
+    bool extractPregap;
+    int trackCount;
 
     void interrupt(TrackState state);
     void startSplitterThread();
@@ -148,14 +148,22 @@
 /************************************************
  *
  ************************************************/
-DiskPipeline::DiskPipeline(const Disk *disk, QObject *parent) :
+DiskPipeline::DiskPipeline(const Converter::Job &job, QObject *parent) :
     QObject(parent),
     mData(new Data()),
     mTmpDir(nullptr)
 {
     mData->pipeline = this;
-    mData->disk = disk;
+    mData->job = job;
     mData->preGapType =  settings->createCue() ? settings->preGapType() : PreGapType::Skip;
+
+    // If the first track starts with zero second, doesn't make sense to create pregap track.
+    mData->extractPregap = (mData->preGapType == PreGapType::ExtractToFile &&
+                            job.disk->track(0)->cueIndex(1).milliseconds() > 0);
+
+    mData->trackCount = mData->job.tracks.count();
+    if (mData->extractPregap)
+        mData->trackCount += 1;
 }
 
 
@@ -191,17 +199,13 @@
         mData->workDir = mTmpDir->path();
     }
     else
-        mData->workDir = QFileInfo(mData->disk->track(0)->resultFilePath()).dir().absolutePath();
+        mData->workDir = QFileInfo(mData->job.tracks.first()->resultFilePath()).dir().absolutePath();
 
     mData->tmpFilePrefix = QDir::toNativeSeparators(QString("%1/flacon_%2-")
                                                 .arg(mData->workDir)
                                                 .arg(QUuid::createUuid().toString().mid(1, 36)));
 
-
-    Splitter splitter(mData->disk, mData->tmpFilePrefix, mData->preGapType);
-    mData->tracks = splitter.tracks();
-
-    foreach (const Track *track, mData->tracks)
+    foreach (const Track *track, mData->job.tracks)
     {
         mData->trackStates.insert(track, TrackState::NotRunning);
     }
@@ -209,7 +213,7 @@
     if (!mData->createDir(mData->workDir))
         return false;
 
-    foreach (const Track *track, mData->tracks)
+    foreach (const Track *track, mData->job.tracks)
     {
         QString dir = QFileInfo(track->resultFilePath()).absoluteDir().path();
         if (!mData->createDir(dir))
@@ -256,7 +260,7 @@
     }
     else if (settings->outFormat()->gainType() == GainType::Album)
     {
-        if (*count > 0 && mData->gainRequests.count() == mData->tracks.count())
+        if (*count > 0 && mData->gainRequests.count() == mData->trackCount)
         {
             mData->startAlbumGainThread(mData->gainRequests);
             mData->gainRequests.clear();
@@ -280,10 +284,10 @@
     if (!settings->createCue())
         return true;
 
-    CueCreator cue(disk, preGapType);
+    CueCreator cue(job.disk, preGapType);
     if (!cue.write())
     {
-        pipeline->trackError(tracks.first(), cue.errorString());
+        pipeline->trackError(job.tracks.first(), cue.errorString());
         return false;
     }
 
@@ -305,9 +309,9 @@
     if (mode == CoverMode::Scale)
         size = settings->coverImageSize();
 
-    QString dir = QFileInfo(disk->track(0)->resultFilePath()).dir().absolutePath();
+    QString dir = QFileInfo(job.tracks.first()->resultFilePath()).dir().absolutePath();
 
-    CopyCover copyCover(disk, dir, "cover", size);
+    CopyCover copyCover(job.disk, dir, "cover", size);
     bool res = copyCover.run();
 
     if (!res)
@@ -322,7 +326,7 @@
  ************************************************/
 void DiskPipeline::Data::startSplitterThread()
 {
-    Splitter *worker = new Splitter(disk, tmpFilePrefix, preGapType);
+    Splitter *worker = new Splitter(job, tmpFilePrefix, extractPregap, preGapType);
 
     WorkerThread *thread = new WorkerThread(worker, pipeline);
 
@@ -345,7 +349,7 @@
     thread->start();
 
     needStartSplitter = false;
-    trackStates.insert(disk->track(0), TrackState::Splitting);
+    trackStates.insert(job.tracks.first(), TrackState::Splitting);
 
     createCue();
     copyCoverImage();
@@ -479,11 +483,11 @@
     req.format     = settings->outFormat();
 
     // If the original quality is worse than requested, leave it as is.
-    req.bitsPerSample = calcQuality(mData->disk->audioFile()->bitsPerSample(),
+    req.bitsPerSample = calcQuality(mData->job.disk->audioFile()->bitsPerSample(),
                                     settings->value(Settings::Resample_BitsPerSample).toInt(),
                                     int(req.format->maxBitPerSample()));
 
-    req.sampleRate = calcQuality(mData->disk->audioFile()->sampleRate(),
+    req.sampleRate = calcQuality(mData->job.disk->audioFile()->sampleRate(),
                                  settings->value(Settings::Resample_SampleRate).toInt(),
                                  int(req.format->maxSampleRate()));

flacon-5.0.0.tar.gz/converter/diskpipline.h -> flacon-5.1.0.tar.gz/converter/diskpipline.h Changed

flacon-5.0.0.tar.gz/converter/splitter.cpp -> flacon-5.1.0.tar.gz/converter/splitter.cpp Changed

@@ -34,15 +34,14 @@
 /************************************************
  *
  ************************************************/
-Splitter::Splitter(const Disk *disk, const QString &tmpFilePrefix, PreGapType preGapType, QObject *parent):
+Splitter::Splitter(const Converter::Job &job, const QString &tmpFilePrefix, bool extractPregap, PreGapType preGapType, QObject *parent):
     Worker(parent),
-    mDisk(disk),
+    mJob(job),
     mTmpFilePrefix(tmpFilePrefix),
     mPreGapType(preGapType),
-    mCurrentTrack(NULL)
+    mExtractPregap(extractPregap),
+    mCurrentTrack(nullptr)
 {
-    // If the first track starts with zero second, doesn't make sense to create pregap track.
-    mExtractPregapTrack = (mPreGapType == PreGapType::ExtractToFile && mDisk->track(0)->cueIndex(1).milliseconds() > 0);
 }
 
 
@@ -51,27 +50,26 @@
  ************************************************/
 void Splitter::run()
 {
-    mCurrentTrack = 0;
+    mCurrentTrack = nullptr;
     Decoder decoder;
 
-    if (!decoder.open(mDisk->audioFileName()))
+    if (!decoder.open(mJob.disk->audioFileName()))
     {
-        error(mDisk->track(0),
+        error(mJob.tracks.first(),
               tr("I can't read <b>%1</b>:<br>%2",
                  "Splitter error. %1 is a file name, %2 is a system error text.")
-              .arg(mDisk->audioFileName())
+              .arg(mJob.disk->audioFileName())
               .arg(decoder.errorString()));
         return;
     }
 
 
     // Extract pregap to separate file ....................
-    // If the first track starts with zero second, doesn't make sense to create pregap track.
-    if (mExtractPregapTrack)
+    if (mExtractPregap)
     {
-        mCurrentTrack = mDisk->preGapTrack();
-        CueIndex start = mDisk->track(0)->cueIndex(0);
-        CueIndex end   = mDisk->track(0)->cueIndex(1);
+        mCurrentTrack = mJob.disk->preGapTrack();
+        CueIndex start = mJob.disk->track(0)->cueIndex(0);
+        CueIndex end   = mJob.disk->track(0)->cueIndex(1);
         QString outFileName = QString("%1%2.wav").arg(mTmpFilePrefix).arg(0, 2, 10, QLatin1Char('0'));
 
         try
@@ -96,19 +94,22 @@
     connect(&decoder, SIGNAL(progress(int)),
             this, SLOT(decoderProgress(int)));
 
-    for (int i=0; i<mDisk->count(); ++i)
+    for (int i=0; i<mJob.disk->count(); ++i)
     {
-        mCurrentTrack = mDisk->track(i);
+        mCurrentTrack = mJob.disk->track(i);
+        if (!mJob.tracks.contains(mCurrentTrack))
+            continue;
+
         QString outFileName = QString("%1%2.wav").arg(mTmpFilePrefix).arg(i+1, 2, 10, QLatin1Char('0'));
 
         CueIndex start, end;
         if (i==0 && mPreGapType == PreGapType::AddToFirstTrack)
             start = CueTime("00:00:00");
         else
-            start = mDisk->track(i)->cueIndex(1);
+            start = mJob.disk->track(i)->cueIndex(1);
 
-        if (i<mDisk->count()-1)
-            end = mDisk->track(i+1)->cueIndex(01);
+        if (i<mJob.disk->count()-1)
+            end = mJob.disk->track(i+1)->cueIndex(01);
 
         bool ret = decoder.extract(start, end, outFileName);
 
@@ -129,22 +130,6 @@
 /************************************************
  *
  ************************************************/
-const QList<const Track *> Splitter::tracks() const
-{
-    QList<const Track *> res;
-    if (mExtractPregapTrack)
-        res << mDisk->preGapTrack();
-
-    for (int i=0; i<mDisk->count(); ++i)
-        res << mDisk->track(i);
-
-    return res;
-}
-
-
-/************************************************
- *
- ************************************************/
 void Splitter::decoderProgress(int percent)
 {
     emit trackProgress(mCurrentTrack, TrackState::Splitting, percent);

flacon-5.0.0.tar.gz/converter/splitter.h -> flacon-5.1.0.tar.gz/converter/splitter.h Changed

flacon-5.0.0.tar.gz/disk.cpp -> flacon-5.1.0.tar.gz/disk.cpp Changed

@@ -81,11 +81,11 @@
 {
     if (!mTracks.isEmpty())
     {
-        mPreGapTrack.setTags(*mTracks.first());
+        mPreGapTrack = *mTracks.first();
         mPreGapTrack.setCueFileName(mTracks.first()->cueFileName());
-        mPreGapTrack.setTag(TagId::TrackNum, QByteArray("0"));
     }
 
+    mPreGapTrack.setTag(TagId::TrackNum, QByteArray("0"));
     mPreGapTrack.setTitle("(HTOA)");
     return &mPreGapTrack;
 }
@@ -359,7 +359,18 @@
 
     for (int i=0; i<mTracks.count(); ++i)
     {
-        mTracks[i]->setTags(tags.at(i));
+        Track *track = mTracks[i];
+        const Track &tgs = tags.at(i);
+
+        track->blockSignals(true);
+        track->setTag(TagId::Album,       tgs.tagValue(TagId::Album));
+        track->setTag(TagId::Date,        tgs.tagValue(TagId::Date));
+        track->setTag(TagId::Genre,       tgs.tagValue(TagId::Genre));
+        track->setTag(TagId::Artist,      tgs.tagValue(TagId::Artist));
+        track->setTag(TagId::SongWriter,  tgs.tagValue(TagId::SongWriter));
+        track->setTag(TagId::Title,       tgs.tagValue(TagId::Title));
+        track->setTag(TagId::AlbumArtist, tgs.tagValue(TagId::AlbumArtist));
+        track->blockSignals(false);
     }
 }
 
@@ -543,22 +554,6 @@
 /************************************************
 
  ************************************************/
-QString Disk::safeString(const QString &str)
-{
-    QString res = str;
-    res.replace('|', "-");
-    res.replace('/', "-");
-    res.replace('\\', "-");
-    res.replace(':', "-");
-    res.replace('*', "-");
-    res.replace('?', "-");
-    return res;
-}
-
-
-/************************************************
-
- ************************************************/
 QString Disk::tagSetTitle() const
 {
     if (mCurrentTagsUri.isEmpty())
@@ -680,6 +675,10 @@
 void Disk::addTagSet(const Tracks &tags, bool activate)
 {
     mTagSets[tags.uri()] = tags;
+    // Sometimes CDDB response contains an additional
+    // DATA track. For example
+    // http://freedb.freedb.org/~cddb/cddb.cgi?cmd=CDDB+READ+rock+A20FA70C&hello=a+127.0.0.1+f+0&proto=5
+    mTagSets[tags.uri()].resize(mTracks.count());
 
     if (activate)
         activateTagSet(tags.uri());
@@ -714,6 +713,9 @@
     for (int i=0; i<disks.count(); ++i)
     {
         const Tracks &disk = disks.at(i);
+        if (disk.count() < mTracks.count())
+            continue;
+
         addTagSet(disk, false);
         int n = distance(disk);
         if (n<minDist)

flacon-5.0.0.tar.gz/disk.h -> flacon-5.1.0.tar.gz/disk.h Changed

flacon-5.0.0.tar.gz/gui/aboutdialog/translatorsinfo.cpp -> flacon-5.1.0.tar.gz/gui/aboutdialog/translatorsinfo.cpp Changed

@@ -29,9 +29,11 @@
 #include <QtCore/QSettings>
 #include <QtCore/QStringList>
 #include <QtCore/QTextCodec>
-#include <QtGui/QTextDocument>
 
-void fillLangguages(QMap<QString, QString> *languages)
+/************************************************
+ *
+ ************************************************/
+static void fillLangguages(QMap<QString, QString> *languages)
 {
     languages->insert("ach"   ,"Acoli");
     languages->insert("af"    ,"Afrikaans");
@@ -319,50 +321,69 @@
 }
 
 
-QString getValue(const QSettings &src, const QString &key)
+
+/************************************************
+ *
+ ************************************************/
+static QString getValue(const QSettings &src, const QString &key)
 {
     QString ret = src.value(key).toString().trimmed();
-    if (ret == "-")
-        return "";
+    const char* garbage[] =
+    {
+        "-",
+        "--",
+        "N/A",
+        "None"
+    };
+
+    for (const auto &s: garbage)
+    {
+        if (ret == s)
+            return "";
+    }
 
     return ret;
 }
 
 
-
+/************************************************
+ *
+ ************************************************/
 TranslatorsInfo::TranslatorsInfo()
 {
-    //fillLangguages(&mLanguagesList);
-
     QSettings src(":/translatorsInfo", QSettings::IniFormat);
     src.setIniCodec("UTF-8");
 
     foreach(QString group, src.childGroups())
     {
+        QSet<QString> processed;
+
         QString lang = group.section("_", 1).remove(".info");
         src.beginGroup(group);
         int cnt = src.allKeys().count();
         for (int i=0; i<cnt; i++)
         {
+
             QString nameEnglish = getValue(src, QString("translator_%1_nameEnglish").arg(i));
             QString nameNative = getValue(src, QString("translator_%1_nameNative").arg(i));
             QString contact = getValue(src, QString("translator_%1_contact").arg(i));
 
             if (nameEnglish.startsWith(QString("Translator %1. ").arg(i)))
-                nameEnglish = "";
+                nameEnglish.clear();
 
             if (nameNative.startsWith(QString("Translator %1. ").arg(i)))
-                nameNative = "";
+                nameNative.clear();
 
             if (contact.startsWith(QString("Translator %1. ").arg(i)))
-                contact = "";
+                contact.clear();
 
             if (nameEnglish.isEmpty())
                 nameEnglish = nameNative;
 
-            if (!nameEnglish.isEmpty())
+            if (!nameEnglish.isEmpty() && !processed.contains(nameEnglish))
             {
                 process(lang, nameEnglish, nameNative, contact);
+                processed << nameEnglish;
             }
 
         }
@@ -371,11 +392,18 @@
 
 }
 
+/************************************************
+ *
+ ************************************************/
 TranslatorsInfo::~TranslatorsInfo()
 {
     qDeleteAll(mItems);
 }
 
+
+/************************************************
+ *
+ ************************************************/
 QString TranslatorsInfo::asHtml() const
 {
     QString ret;
@@ -388,7 +416,9 @@
 }
 
 
-
+/************************************************
+ *
+ ************************************************/
 void TranslatorsInfo::process(const QString &lang, const QString &englishName, const QString &nativeName, const QString &contact)
 {
     QString key = QString("%1:%2:%3").arg(englishName, nativeName, contact);
@@ -404,6 +434,9 @@
 }
 
 
+/************************************************
+ *
+ ************************************************/
 Translator::Translator(const QString &englishName, const QString &nativeName, const QString &contact)
 {
     mEnglishName = englishName;
@@ -430,6 +463,9 @@
 }
 
 
+/************************************************
+ *
+ ************************************************/
 void Translator::addLanguage(QString langId)
 {
     static QMap<QString, QString> mLanguagesList;
@@ -445,6 +481,9 @@
 }
 
 
+/************************************************
+ *
+ ************************************************/
 QString Translator::asHtml()
 {
     QString ret(mInfo);

flacon-5.0.0.tar.gz/gui/configdialog/configdialog.cpp -> flacon-5.1.0.tar.gz/gui/configdialog/configdialog.cpp Changed

@@ -123,6 +123,35 @@
     load();
 
     preGapComboBox->setEnabled(perTrackCueCheck->isChecked());
+
+
+    perTrackCueFormatBtn->addPattern("%a", tr("Insert \"Artist\""));
+    perTrackCueFormatBtn->addPattern("%A", tr("Insert \"Album title\""));
+    perTrackCueFormatBtn->addPattern("%y", tr("Insert \"Year\""));
+    perTrackCueFormatBtn->addPattern("%g", tr("Insert \"Genre\""));
+
+    const QString patterns[] = {
+        "%a-%A.cue",
+        "%a - %A.cue",
+        "%a - %y - %A.cue"};
+
+
+    for (QString pattern: patterns)
+    {
+        perTrackCueFormatBtn->addFullPattern(pattern,
+                                             tr("Use \"%1\"", "Predefined CUE file name, string like 'Use \"%a/%A/%n - %t.cue\"'")
+                                             .arg(pattern)
+                                             + "  ( " + patternExample(pattern) + " )");
+    }
+
+    connect(perTrackCueFormatBtn, &OutPatternButton::paternSelected,
+            [this](const QString &pattern){ perTrackCueFormatEdit->lineEdit()->insert(pattern);});
+
+    connect(perTrackCueFormatBtn, &OutPatternButton::fullPaternSelected,
+            [this](const QString &pattern){ perTrackCueFormatEdit->lineEdit()->setText(pattern);});
+
+
+    perTrackCueFormatBtn->setIcon(loadIcon("pattern-button"));
 }
 
 
@@ -379,7 +408,7 @@
     EncoderConfigPage::loadWidget("Encoder/TmpDir",        tmpDirEdit);
     EncoderConfigPage::loadWidget("PerTrackCue/Create",    perTrackCueCheck);
     EncoderConfigPage::loadWidget("PerTrackCue/Pregap",    preGapComboBox);
-
+    perTrackCueFormatEdit->setEditText(settings->value(Settings::PerTrackCue_FileName).toString());
 
     loadWidget(Settings::Resample_BitsPerSample,   bitDepthComboBox);
     loadWidget(Settings::Resample_SampleRate, sampleRateComboBox);
@@ -410,6 +439,8 @@
     EncoderConfigPage::writeWidget("PerTrackCue/Create",    perTrackCueCheck);
     EncoderConfigPage::writeWidget("PerTrackCue/Pregap",    preGapComboBox);
 
+    settings->setValue(Settings::PerTrackCue_FileName, perTrackCueFormatEdit->currentText());
+
     writeWidget(Settings::Resample_BitsPerSample,   bitDepthComboBox);
     writeWidget(Settings::Resample_SampleRate, sampleRateComboBox);

flacon-5.0.0.tar.gz/gui/configdialog/configdialog.ui -> flacon-5.1.0.tar.gz/gui/configdialog/configdialog.ui Changed

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>635</width>
-    <height>597</height>
+    <height>827</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -135,13 +135,16 @@
          </item>
          <item>
           <widget class="QGroupBox" name="perTrackCueGroup">
+           <property name="minimumSize">
+            <size>
+             <width>0</width>
+             <height>0</height>
+            </size>
+           </property>
            <property name="title">
             <string>Per track CUE sheet</string>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_3">
-            <property name="sizeConstraint">
-             <enum>QLayout::SetMinimumSize</enum>
-            </property>
             <item>
              <widget class="QCheckBox" name="perTrackCueCheck">
               <property name="text">
@@ -151,7 +154,7 @@
             </item>
             <item>
              <layout class="QGridLayout" name="gridLayout">
-              <item row="0" column="0">
+              <item row="1" column="0">
                <widget class="QLabel" name="preGapLabel">
                 <property name="text">
                  <string>First track pregap:</string>
@@ -159,6 +162,27 @@
                </widget>
               </item>
               <item row="0" column="1">
+               <widget class="QComboBox" name="perTrackCueFormatEdit">
+                <property name="editable">
+                 <bool>true</bool>
+                </property>
+               </widget>
+              </item>
+              <item row="0" column="2">
+               <widget class="OutPatternButton" name="perTrackCueFormatBtn">
+                <property name="text">
+                 <string notr="true">*</string>
+                </property>
+               </widget>
+              </item>
+              <item row="0" column="0">
+               <widget class="QLabel" name="perTrackCueLabel">
+                <property name="text">
+                 <string extracomment="Settings dialog, label for the edit control with name of the created CUE file.">File name format:</string>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="1" colspan="2">
                <widget class="QComboBox" name="preGapComboBox">
                 <property name="sizePolicy">
                  <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -309,8 +333,8 @@
              <rect>
               <x>0</x>
               <y>0</y>
-              <width>579</width>
-              <height>385</height>
+              <width>100</width>
+              <height>30</height>
              </rect>
             </property>
             <layout class="QVBoxLayout" name="verticalLayout_12">
@@ -451,6 +475,11 @@
    <extends>QComboBox</extends>
    <header>controls.h</header>
   </customwidget>
+  <customwidget>
+   <class>OutPatternButton</class>
+   <extends>QToolButton</extends>
+   <header>controls.h</header>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>pages</tabstop>

flacon-5.0.0.tar.gz/gui/controls.cpp -> flacon-5.1.0.tar.gz/gui/controls.cpp Changed

flacon-5.0.0.tar.gz/gui/mainwindow.cpp -> flacon-5.1.0.tar.gz/gui/mainwindow.cpp Changed

@@ -141,35 +141,28 @@
     outPatternButton->addPattern("%t", tr("Insert \"Track title\""));
     outPatternButton->addPattern("%y", tr("Insert \"Year\""));
     outPatternButton->addPattern("%g", tr("Insert \"Genre\""));
-    outPatternButton->setAutoRaise(true);
-    outPatternButton->setStyleSheet("border: none;");
 
-    QString pattern;
+    const QString patterns[] = {
+        "%a/{%y - }%A/%n - %t",
+        "%a -{ %y }%A/%n - %t",
+        "{%y }%A - %a/%n - %t",
+        "%a/%A/%n - %t",
+        "%a - %A/%n - %t",
+        "%A - %a/%n - %t" };
 
-    pattern = "%a/{%y - }%A/%n - %t";
-    outPatternButton->addFullPattern(pattern, tr("Use \"%1\"", "Predefined out file pattern, string like 'Use \"%a/%A/%n - %t\"'").arg(pattern));
-
-    pattern = "%a -{ %y }%A/%n - %t";
-    outPatternButton->addFullPattern(pattern, tr("Use \"%1\"", "Predefined out file pattern, string like 'Use \"%a/%A/%n - %t\"'").arg(pattern));
-
-    pattern = "{%y }%A - %a/%n - %t";
-    outPatternButton->addFullPattern(pattern, tr("Use \"%1\"", "Predefined out file pattern, string like 'Use \"%a/%A/%n - %t\"'").arg(pattern));
-
-    pattern = "%a/%A/%n - %t";
-    outPatternButton->addFullPattern(pattern, tr("Use \"%1\"", "Predefined out file pattern, string like 'Use \"%a/%A/%n - %t\"'").arg(pattern));
-
-    pattern = "%a - %A/%n - %t";
-    outPatternButton->addFullPattern(pattern, tr("Use \"%1\"", "Predefined out file pattern, string like 'Use \"%a/%A/%n - %t\"'").arg(pattern));
-
-    pattern = "%A - %a/%n - %t";
-    outPatternButton->addFullPattern(pattern, tr("Use \"%1\"", "Predefined out file pattern, string like 'Use \"%a/%A/%n - %t\"'").arg(pattern));
+    for (QString pattern: patterns)
+    {
+        outPatternButton->addFullPattern(pattern,
+                                         tr("Use \"%1\"", "Predefined out file pattern, string like 'Use \"%a/%A/%n - %t\"'")
+                                         .arg(pattern)
+                                         + "  ( " + patternExample(pattern)  + ".flac )");
+    }
 
     outPatternButton->menu()->addSeparator();
 
     outPatternEdit->deleteItemAction()->setText(tr("Delete current pattern from history"));
     outPatternButton->menu()->addAction(outPatternEdit->deleteItemAction());
 
-    outPatternButton->setFixedWidth(outDirButton->sizeHint().width());
     connect(outPatternButton, SIGNAL(paternSelected(QString)),
             this, SLOT(insertOutPattern(QString)));
 
@@ -583,9 +576,54 @@
 
 
 /************************************************
+ *
+ ************************************************/
+void MainWindow::startConvertAll()
+{
+    Converter::Jobs jobs;
+    for (int d=0; d<project->count(); ++d)
+    {
+        Converter::Job job;
+        job.disk = project->disk(d);
+        for (int t=0; t<job.disk->count(); ++t)
+            job.tracks << job.disk->track(t);
+        jobs << job;
+    }
+
+    startConvert(jobs);
+}
 
+
+/************************************************
+ *
  ************************************************/
-void MainWindow::startConvert()
+void MainWindow::startConvertSelected()
+{
+    Converter::Jobs jobs;
+    for (Disk *disk: trackView->selectedDisks())
+    {
+        Converter::Job job;
+        job.disk = disk;
+
+        for (int t=0; t<disk->count(); ++t)
+        {
+            Track *track = disk->track(t);
+            if (trackView->isSelected(*track))
+                job.tracks << track;
+
+        }
+
+        jobs << job;
+    }
+
+    startConvert(jobs);
+}
+
+
+/************************************************
+
+ ************************************************/
+void MainWindow::startConvert(const Converter::Jobs &jobs)
 {
     trackView->setFocus();
 
@@ -624,7 +662,7 @@
             trackView->model(), SLOT(trackProgressChanged(Track,TrackState,Percent)));
 
 
-    mConverter->start();
+    mConverter->start(jobs);
     setControlsEnable();
 }
 
@@ -1034,9 +1072,11 @@
     actionDownloadTrackInfo->setIcon(loadIcon("download-info"));
     connect(actionDownloadTrackInfo, SIGNAL(triggered()), this, SLOT(downloadInfo()));
 
-
     actionStartConvert->setIcon(loadIcon("start-convert"));
-    connect(actionStartConvert, SIGNAL(triggered()), this, SLOT(startConvert()));
+    connect(actionStartConvert, SIGNAL(triggered()), this, SLOT(startConvertAll()));
+
+    actionStartConvertSelected->setIcon(loadIcon("start-convert"));
+    connect(actionStartConvertSelected, SIGNAL(triggered()), this, SLOT(startConvertSelected()));
 
     actionAbortConvert->setIcon(loadIcon("abort-convert"));
     connect(actionAbortConvert, SIGNAL(triggered()), this, SLOT(stopConvert()));

flacon-5.0.0.tar.gz/gui/mainwindow.h -> flacon-5.1.0.tar.gz/gui/mainwindow.h Changed

flacon-5.0.0.tar.gz/gui/mainwindow.ui -> flacon-5.1.0.tar.gz/gui/mainwindow.ui Changed

flacon-5.0.0.tar.gz/gui/trackview.cpp -> flacon-5.1.0.tar.gz/gui/trackview.cpp Changed

flacon-5.0.0.tar.gz/gui/trackview.h -> flacon-5.1.0.tar.gz/gui/trackview.h Changed

flacon-5.0.0.tar.gz/main.cpp -> flacon-5.1.0.tar.gz/main.cpp Changed

@@ -47,6 +47,8 @@
 #include "updater/updater.h"
 #endif
 
+static bool quiet;
+
 /************************************************
  *
  ************************************************/
@@ -60,6 +62,7 @@
     out << "Generic options:" << endl;
     out << "  -s --start                Start to convert immediately." << endl;
     out << "  -c --config <file>        Specify an alternative configuration file." << endl;
+    out << "  -q --quiet                Quiet mode (no output)." << endl;
 
     out << "  -h, --help                Show help about options" << endl;
     out << "  --version                 Show version information" << endl;
@@ -180,6 +183,7 @@
         return 10;
 
     Converter converter;
+    converter.setShowStatistic(!quiet);
     app.connect(&converter, SIGNAL(finished()),
                 &app, SLOT(quit()));
 
@@ -234,6 +238,8 @@
     parser.addOption(QCommandLineOption(                        "version", "Show version information."));
     parser.addOption(QCommandLineOption(QStringList() << "s" << "start"  , "Start to convert immediately."));
     parser.addOption(QCommandLineOption(QStringList() << "c" << "config" , "Specify an alternative configuration file.", "config file"));
+    parser.addOption(QCommandLineOption(QStringList() << "q" << "quiet"  , "Quiet mode (no output)."));
+
 
     QStringList args;
     for (int i=0; i<argc; ++i)
@@ -263,6 +269,7 @@
         Settings::setFileName(parser.value("config"));
     }
 
+    quiet = parser.isSet("quiet");
 
     if (parser.isSet("start"))
         return runConsole(argc, argv, parser.positionalArguments());

flacon-5.0.0.tar.gz/settings.cpp -> flacon-5.1.0.tar.gz/settings.cpp Changed

flacon-5.0.0.tar.gz/settings.h -> flacon-5.1.0.tar.gz/settings.h Changed

flacon-5.1.0.tar.gz/tests/data/testConvert/01 with pregap and HTOA, without cue Added

flacon-5.1.0.tar.gz/tests/data/testConvert/01 with pregap and HTOA, without cue/01.cuecreator.cue Changed

flacon-5.1.0.tar.gz/tests/data/testConvert/01 with pregap and HTOA, without cue/01.expected.cue Changed

flacon-5.1.0.tar.gz/tests/data/testConvert/01 with pregap and HTOA, without cue/flacon.conf Added

flacon-5.1.0.tar.gz/tests/data/testConvert/01 with pregap and HTOA, without cue/spec.ini Added

flacon-5.1.0.tar.gz/tests/data/testConvert/02 with pregap and HTOA, with cue Added

flacon-5.1.0.tar.gz/tests/data/testConvert/02 with pregap and HTOA, with cue/expected.cue Added

flacon-5.1.0.tar.gz/tests/data/testConvert/02 with pregap and HTOA, with cue/flacon.conf Added

flacon-5.1.0.tar.gz/tests/data/testConvert/02 with pregap and HTOA, with cue/source.cue Added

flacon-5.1.0.tar.gz/tests/data/testConvert/02 with pregap and HTOA, with cue/spec.ini Added

flacon-5.1.0.tar.gz/tests/data/testConvert/03 Without pregap, without HTOA Added

flacon-5.1.0.tar.gz/tests/data/testConvert/03 Without pregap, without HTOA/expected.cue Changed

flacon-5.1.0.tar.gz/tests/data/testConvert/03 Without pregap, without HTOA/flacon.conf Added

flacon-5.1.0.tar.gz/tests/data/testConvert/03 Without pregap, without HTOA/source.cue Changed

flacon-5.1.0.tar.gz/tests/data/testConvert/03 Without pregap, without HTOA/spec.ini Added

flacon-5.1.0.tar.gz/tests/data/testConvert/04 Without pregap, without HTOA Added

flacon-5.1.0.tar.gz/tests/data/testConvert/04 Without pregap, without HTOA/expected.cue Added

flacon-5.1.0.tar.gz/tests/data/testConvert/04 Without pregap, without HTOA/flacon.conf Added

flacon-5.1.0.tar.gz/tests/data/testConvert/04 Without pregap, without HTOA/source.cue Added

flacon-5.1.0.tar.gz/tests/data/testConvert/04 Without pregap, without HTOA/spec.ini Added

flacon-5.1.0.tar.gz/tests/data/testConvert/05 With pregap, without HTOA Added

flacon-5.1.0.tar.gz/tests/data/testConvert/05 With pregap, without HTOA/expected.cue Changed

flacon-5.1.0.tar.gz/tests/data/testConvert/05 With pregap, without HTOA/flacon.conf Added

flacon-5.1.0.tar.gz/tests/data/testConvert/05 With pregap, without HTOA/source.cue Changed

flacon-5.1.0.tar.gz/tests/data/testConvert/05 With pregap, without HTOA/spec.ini Added

flacon-5.1.0.tar.gz/tests/data/testConvert/06 All tags Added

flacon-5.1.0.tar.gz/tests/data/testConvert/06 All tags/expected.cue Changed

flacon-5.1.0.tar.gz/tests/data/testConvert/06 All tags/flacon.conf Added

flacon-5.1.0.tar.gz/tests/data/testConvert/06 All tags/source.cue Changed

flacon-5.1.0.tar.gz/tests/data/testConvert/06 All tags/spec.ini Added

flacon-5.1.0.tar.gz/tests/data/testConvert/07 Garbage in the CUE Added

flacon-5.1.0.tar.gz/tests/data/testConvert/07 Garbage in the CUE/expected.cue Changed

flacon-5.1.0.tar.gz/tests/data/testConvert/07 Garbage in the CUE/flacon.conf Added

flacon-5.1.0.tar.gz/tests/data/testConvert/07 Garbage in the CUE/source.cue Changed

flacon-5.1.0.tar.gz/tests/data/testConvert/07 Garbage in the CUE/spec.ini Added

flacon-5.1.0.tar.gz/tests/data/testConvert/08 path with symbols and space Added

flacon-5.1.0.tar.gz/tests/data/testConvert/08 path with symbols and space/expected.cue Added

flacon-5.1.0.tar.gz/tests/data/testConvert/08 path with symbols and space/flacon.conf Added

flacon-5.1.0.tar.gz/tests/data/testConvert/08 path with symbols and space/source.cue Changed

flacon-5.1.0.tar.gz/tests/data/testConvert/08 path with symbols and space/spec.ini Added

flacon-5.1.0.tar.gz/tests/data/testConvert/09 Russian Added

flacon-5.1.0.tar.gz/tests/data/testConvert/09 Russian/expected.cue Added

flacon-5.1.0.tar.gz/tests/data/testConvert/09 Russian/flacon.conf Added

flacon-5.1.0.tar.gz/tests/data/testConvert/09 Russian/source.cue Added

flacon-5.1.0.tar.gz/tests/data/testConvert/09 Russian/spec.ini Added

flacon-5.1.0.tar.gz/tests/data/testConvert/10 Multi Added

flacon-5.1.0.tar.gz/tests/data/testConvert/10 Multi/01_source.cue Added

flacon-5.1.0.tar.gz/tests/data/testConvert/10 Multi/02_source.cue Added

flacon-5.1.0.tar.gz/tests/data/testConvert/10 Multi/flacon.conf Added

flacon-5.1.0.tar.gz/tests/data/testConvert/10 Multi/spec.ini Added

flacon-5.1.0.tar.gz/tests/data/testConvert/11 Temporary dir Added

flacon-5.1.0.tar.gz/tests/data/testConvert/11 Temporary dir/01.cuecreator.cue Added

flacon-5.1.0.tar.gz/tests/data/testConvert/11 Temporary dir/01.expected.cue Added

flacon-5.1.0.tar.gz/tests/data/testConvert/11 Temporary dir/flacon.conf Added

flacon-5.1.0.tar.gz/tests/data/testConvert/11 Temporary dir/spec.ini Added

flacon-5.1.0.tar.gz/tests/data/testConvert/12.1 AlbumGain without pregap Added

flacon-5.1.0.tar.gz/tests/data/testConvert/12.1 AlbumGain without pregap/flacon.conf Added

flacon-5.1.0.tar.gz/tests/data/testConvert/12.1 AlbumGain without pregap/source.cue Added

flacon-5.1.0.tar.gz/tests/data/testConvert/12.1 AlbumGain without pregap/spec.ini Added

flacon-5.1.0.tar.gz/tests/data/testConvert/12.2 AlbumGain with pregap Added

flacon-5.1.0.tar.gz/tests/data/testConvert/12.2 AlbumGain with pregap/expected.cue Added

flacon-5.1.0.tar.gz/tests/data/testConvert/12.2 AlbumGain with pregap/flacon.conf Added

flacon-5.1.0.tar.gz/tests/data/testConvert/12.2 AlbumGain with pregap/source.cue Added

flacon-5.1.0.tar.gz/tests/data/testConvert/12.2 AlbumGain with pregap/spec.ini Added

flacon-5.0.0.tar.gz/tests/test_convert.cpp -> flacon-5.1.0.tar.gz/tests/test_convert.cpp Changed

@@ -26,216 +26,200 @@
 #include <QTest>
 #include "testflacon.h"
 #include "types.h"
-#include "../settings.h"
-#include "outformat.h"
-#include "../converter/wavheader.h"
+//#include "../settings.h"
 #include "tools.h"
-#include "project.h"
-#include "../inputaudiofile.h"
-#include "../converter/converter.h"
-#include "tags.h"
 
 #include <QDir>
-#include <QDebug>
+#include <QProcess>
+#include <QDirIterator>
+#include <QSettings>
 
 
-
-struct TestConvertRequest {
-    QString cueFile;
-    QString audioFile;
-    QString expectedCue;
-    QStringList resultFiles;
-    QStringList tags;
-
-    void clear() {
-        cueFile.clear();
-        audioFile.clear();
-        expectedCue.clear();
-        resultFiles.clear();
-        tags.clear();
-
-    }
-};
-Q_DECLARE_METATYPE(TestConvertRequest)
-Q_DECLARE_METATYPE(QList<TestConvertRequest>)
-
 /************************************************
  *
  ************************************************/
-void consoleErroHandler(const QString &message)
+static QStringList findFiles(const QString &dir, const QString &pattern)
 {
-    QString msg(message);
-    msg.remove(QRegExp("<[^>]*>"));
-    qWarning() << "Converter error:" << msg;
+    QStringList res;
+    QDirIterator it(dir, QStringList() << pattern, QDir::Files, QDirIterator::Subdirectories);
+    while (it.hasNext())
+    {
+        res << (it.next()).remove(dir + "/");
+    }
+    return res;
 }
 
 
 /************************************************
  *
  ************************************************/
-TagId tagNameToId(const QString &tagName)
-{
-    if (tagName.toUpper() == "ALBUM")         return TagId::Album;
-    if (tagName.toUpper() == "CATALOG")       return TagId::Catalog;
-    if (tagName.toUpper() == "CDTEXTFILE")    return TagId::CDTextfile;
-    if (tagName.toUpper() == "COMMENT")       return TagId::Comment;
-    if (tagName.toUpper() == "DATE")          return TagId::Date;
-    if (tagName.toUpper() == "FLAGS")         return TagId::Flags;
-    if (tagName.toUpper() == "GENRE")         return TagId::Genre;
-    if (tagName.toUpper() == "ISRC")          return TagId::ISRC;
-    if (tagName.toUpper() == "PERFORMER")     return TagId::Artist;
-    if (tagName.toUpper() == "SONGWRITER")    return TagId::SongWriter;
-    if (tagName.toUpper() == "TITLE")         return TagId::Title;
-    if (tagName.toUpper() == "DISCId")        return TagId::DiscId;
-    if (tagName.toUpper() == "FILE")          return TagId::File;
-    if (tagName.toUpper() == "DISKNUM")       return TagId::DiskNum;
-    if (tagName.toUpper() == "DISCOUNT")      return TagId::DiskCount;
-    if (tagName.toUpper() == "CUEFILE")       return TagId::CueFile;
-
-    FAIL("Unknown TAG: \"" + tagName +"\"");
-    return TagId(0);
-}
-
-/************************************************
- *
- ************************************************/
 void TestFlacon::testConvert()
 {
-    QFETCH(bool, createCue);
-    QFETCH(int, preGapType);
-    QFETCH(QString, tmpDir);
-    QFETCH(QList<TestConvertRequest>, requests);
-
-    settings->setOutFormat("WAV");
-    settings->setCreateCue(createCue);
-    settings->setPregapType(PreGapType(preGapType));
-    settings->setTmpDir(tmpDir.isEmpty() ? "" : (dir() + "/" + tmpDir));
-    settings->setOutFileDir(dir());
-    settings->setOutFilePattern("%a/%n - %t");
-
-    project->clear();
-    foreach (TestConvertRequest req, requests)
+    QFETCH(QString, dataDir);
+
+    QFile::copy(dataDir + "/spec.ini", dir() + "/spec.ini");
+    QSettings spec(dir() + "/spec.ini", QSettings::IniFormat);
+    spec.setIniCodec("UTF-8");
+
+    const QString cfgFile(dir() + "/flacon.conf");
+    const QString inDir(dir()  + "/IN");
+    const QString outDir(dir() + "/OUT");
+    QDir(inDir).mkpath(".");
+    QDir(outDir).mkpath(".");
+
+
+    // Create config ............................
     {
-        QString srcAudioFile  = req.audioFile.section(':', 0, 0);
-        QString destAudioFile = req.audioFile.section(':', 1);
+        QString src = dataDir + "/flacon.conf";
+        if (!QFile::copy(src,  cfgFile))
+            QFAIL(QString("Can't copy config file \"%1\"").arg(src).toLocal8Bit());
+
+        QSettings cfg(cfgFile, QSettings::IniFormat);
+        cfg.setIniCodec("UTF-8");
+        cfg.setValue("OutFiles/Directory", outDir);
+        cfg.sync();
+    }
+    // ..........................................
 
-        if (!destAudioFile.isEmpty())
-        {
-            destAudioFile = dir() + "/" + destAudioFile;
-            QFileInfo(destAudioFile).dir().mkpath(".");
-            QFile::copy(srcAudioFile, destAudioFile);
-        }
-        else
-        {
-            destAudioFile = srcAudioFile;
-        }
 
-        Disk *disk = loadFromCue(req.cueFile);
-        InputAudioFile audio(destAudioFile);
-        disk->setAudioFile(audio);
-        project->addDisk(disk);
+    // Copy source audio files ..................
+    spec.beginGroup("Source_Audio");
+    foreach (auto key, spec.allKeys())
+    {
+        QString src  = mTmpDir + "/" + key;
+        QString dest = inDir   + "/" + spec.value(key).toString();
 
-        foreach (QString line, req.tags)
-        {
-            line = line.trimmed();
-            if (line.isEmpty())
-                continue;
-
-            int n = line.section(' ', 0, 0).toInt() - 1;
-            Track *track = disk->track(n);
-
-            foreach (QString s, line.section(' ', 1).split(','))
-            {
-                TagId tagId = tagNameToId(s.section(':', 0, 0).trimmed());
-                track->setTag(tagId, s.section(':', 1).trimmed());
-            }
-        }
+        QFileInfo(dest).dir().mkpath(".");
+        if (!QFile::copy(src,  dest))
+            QFAIL(QString("Can't copy audio file \"%1\"").arg(src).toLocal8Bit());
     }
+    spec.endGroup();
+    // ..........................................
 
-    Converter conv;
-    conv.setShowStatistic(false);
-    QEventLoop loop;
-    loop.connect(&conv, SIGNAL(finished()), &loop, SLOT(quit()));
-    conv.start();
+    // Copy source CUE files ....................
+    spec.beginGroup("Source_CUE");
+    foreach (auto key, spec.allKeys())
+    {
+        QString src  = dataDir + "/" + key;
+        QString dest = inDir   + "/" + spec.value(key).toString();
 
+        QFileInfo(dest).dir().mkpath(".");
+        if (!QFile::copy(src,  dest))
+            QFAIL(QString("Can't copy CUE file \"%1\"").arg(src).toLocal8Bit());
+    }
+    spec.endGroup();
+    // ..........................................
 
-    if (!conv.isRunning())
+    // Copy expected CUE files ....................
+    spec.beginGroup("Result_CUE");
+    foreach (auto key, spec.allKeys())
     {
-        for (int i=0; i<project->count(); i++)
+        QString dest = dir()   + "/" + spec.value(key).toString();
+        QString src  = dataDir + "/" + spec.value(key).toString();
+        QFileInfo(dest).dir().mkpath(".");
+        if (!QFile::copy(src,  dest))
+            QFAIL(QString("Can't copy CUE file \"%1\"").arg(src).toLocal8Bit());
+    }
+    spec.endGroup();
+    // ..........................................
+
+    // Run flacon ...............................
+    QString flacon = QCoreApplication::applicationDirPath() + "/../flacon";
+    QStringList args;
+    args << "--config" << cfgFile;
+    args << "--start";
+    args << "--quiet";
+    args << inDir.toLocal8Bit().data();
+
+    {
+        QFile file(dir() + "/start.sh");
+        file.open(QIODevice::WriteOnly);
+        file.write("\"" + flacon.toLocal8Bit() + "\"");
+        for (QString a: args)
         {
-            QString msg;
-            if (! project->disk(i)->canConvert(&msg))
-            {
-                QFAIL(QString("Can't start converter: \"%1\"").arg(msg).toLocal8Bit());
-            }
+            a.replace("\"", "\\\"");
+            file.write(" \\\n    \"" + a.toLocal8Bit() + "\"");
         }
+        file.close();
     }
 
-    loop.exec();
+    QProcess proc;
+    proc.start(flacon, args);
+    if (!proc.waitForFinished(30 * 1000))
+        QFAIL("The program timed out waiting for the result.");
 
-    // Checks __________________________________________________
-    for (int i=0; i<project->count(); i++)
+    if (proc.exitCode() != 0)
     {
-        TestConvertRequest req = requests.at(i);
-        QDir outDir = QFileInfo(project->disk(i)->track(0)->resultFilePath()).dir();
-        QStringList files = outDir.entryList(QDir::NoDotAndDotDot | QDir::System | QDir::Hidden | QDir::Files);
+        QFAIL(QString("Can't start converter: \"%1\"")
+              .arg(QString::fromLocal8Bit(proc.readAllStandardError())).toLocal8Bit());
+    }
+    // ..........................................
 
-        QFile::copy(req.cueFile, outDir.absoluteFilePath("source_%1.cue").arg(i, 2, 10, QChar('0')));
+    // Check ____________________________________
+    QString msg = "";
+    QStringList files = findFiles(outDir, "*");
+    QStringList missing;
 
-        if (! req.expectedCue.isEmpty())
-            QFile::copy(req.expectedCue, outDir.absoluteFilePath("expected_%1.cue").arg(i, 2, 10, QChar('0')));
+    // ..........................................
+    spec.beginGroup("Result_Audio");
+    foreach (auto key, spec.allKeys())
+    {
+        QString file = key;
+        QString hash = spec.value(key).toString();
 
-        QStringList missing;
-        foreach(QString f, req.resultFiles)
+        if (files.removeAll(file) == 0)
         {
-            QString file = f.section(':', 0, 0).trimmed();
-            QString hash = f.section(':', 1).trimmed();
+            missing << file;
+            continue;
+        }
 
-            if (files.removeAll(file) == 0)
-                missing << file;
+        if (!hash.isEmpty())
+            if (!compareAudioHash(outDir + "/" + file, hash))
+                QFAIL("");
 
-            if (!hash.isEmpty() && QFileInfo(outDir.absoluteFilePath(file)).exists())
-            {
-               if (compareAudioHash(outDir.absoluteFilePath(file), hash))
-                    QFile::remove(outDir.absoluteFilePath(file));
-            }
+    }
+    spec.endGroup();
+    // ..........................................
 
+    // ..........................................
+    spec.beginGroup("Result_CUE");
+    foreach (auto key, spec.allKeys())
+    {
+        QString file = key;
+        QString expected = dir() + "/" + spec.value(key).toString();
 
+        if (files.removeAll(file) == 0)
+        {
+            missing << file;
+            continue;
         }
 
+        QString err;
+        if (!TestFlacon::compareCue(outDir + "/" + file, expected, &err))
+            msg += "\n" + err;
+    }
+    spec.endGroup();
+    // ..........................................
 
-        QString msg = "";
-        if (!missing.isEmpty())
-            msg += QString("\nFiles not exists in %1:\n  *%2")
-                    .arg(outDir.absolutePath())
-                    .arg(missing.join("\n  *"));
 
-        if (!files.isEmpty())
-            msg += QString("\nFiles exists in %1:\n  *%2")
-                    .arg(outDir.absolutePath())
-                    .arg(files.join("\n  *"));
+    if (!missing.isEmpty())
+        msg += QString("\nFiles not exists in %1:\n  * %2")
+                .arg(outDir)
+                .arg(missing.join("\n  * "));
 
-        if (!req.expectedCue.isEmpty())
-        {
-            files = outDir.entryList(QStringList() << "*.cue", QDir::Files);
-            if (files.isEmpty())
-            {
-                msg += "\nResult CUE file not found.";
-            }
-            else
-            {
-                QString err;
-                if (!TestFlacon::compareCue(outDir.absoluteFilePath(files.first()), req.expectedCue, &err))
-                    msg += "\n" + err;
-            }
-        }
+    if (!files.isEmpty())
+        msg += QString("\nFiles exists in %1:\n  * %2")
+                .arg(outDir)
+                .arg(files.join("\n  * "));
 
-        if (!msg.isEmpty())
-            QFAIL(QString("%1\n%2").arg(QTest::currentDataTag()).arg(msg).toLocal8Bit().data());
-    }
-    project->clear();
-}
+    if (!msg.isEmpty())
+        QFAIL(QString("%1\n%2").arg(QTest::currentDataTag()).arg(msg).toLocal8Bit().data());
+
+
+    // ..........................................
 
+    clearDir(dir());
+}
 
 
 /************************************************
@@ -243,303 +227,16 @@
  ************************************************/
 void TestFlacon::testConvert_data()
 {
-    QTest::addColumn<bool>("createCue");
-    QTest::addColumn<int>("preGapType");
-    QTest::addColumn<QString>("tmpDir");
-    QTest::addColumn<QList<TestConvertRequest> >("requests");
-
-    TestConvertRequest req;
-    QList<TestConvertRequest> requests;
-
-
-    QString inDir = mDataDir + "/testConvert/";
-    QString name;
-
-    //=====================================================
-    name ="01.1 With pregap and HTOA, without cue";
-    requests.clear();
-
-    req.clear();
-    req.cueFile     = inDir + "01.cuecreator.cue";
-    req.audioFile   = mAudio_24x96_wav;
-    req.expectedCue = "";
-    req.resultFiles << "01 - Song01.wav : a86e2d59bf1e272b5ab7e9a16009455d"
-                    << "02 - Song02.wav : 1a199e8e2badff1e643a9f1697ac4140"
-                    << "03 - Song03.wav : 71db07cb54faee8545cbed90fe0be6a3"
-                    << "04 - Song04.wav : 2e5df99b43b96c208ab26983140dd19f";
-    requests << req;
-
-    QTest::newRow(name.toUtf8())
-            << false
-            << int(PreGapType::ExtractToFile)
-            << ""
-            << requests;
-    //=====================================================
-
-
-    //=====================================================
-    name = "01.2 With pregap and HTOA, with cue";
-    requests.clear();
-
-    req.clear();
-    req.cueFile     = inDir + "01.cuecreator.cue";
-    req.audioFile   = mAudio_24x96_wav;
-    req.expectedCue = "";
-    req.resultFiles << "01 - Song01.wav : a86e2d59bf1e272b5ab7e9a16009455d"
-                    << "02 - Song02.wav : 1a199e8e2badff1e643a9f1697ac4140"
-                    << "03 - Song03.wav : 71db07cb54faee8545cbed90fe0be6a3"
-                    << "04 - Song04.wav : 2e5df99b43b96c208ab26983140dd19f"
-                    << "00 - (HTOA).wav : afb9e4434b212bacdd62e585461af757"
-                    << "Artist_01-Album.cue";
-    requests << req;
-
-    QTest::newRow(name.toUtf8())
-            << true
-            << int(PreGapType::ExtractToFile)
-            << ""
-            << requests;
-    //=====================================================
-
-
-    //=====================================================
-    name = "02.1 Without pregap, without HTOA";
-    requests.clear();
-
-    req.clear();
-    req.cueFile     = inDir + "02.cuecreator.cue";
-    req.audioFile   = mAudio_24x96_wav;
-    req.expectedCue = "";
-    req.resultFiles << "01 - Song01.wav : 07bb5c5fbf7b9429c05e9b650d9df467"
-                    << "02 - Song02.wav : 1a199e8e2badff1e643a9f1697ac4140"
-                    << "03 - Song03.wav : 71db07cb54faee8545cbed90fe0be6a3"
-                    << "04 - Song04.wav : 2e5df99b43b96c208ab26983140dd19f"
-                    << "Artist_02-Album.cue";
-    requests << req;
-
-    QTest::newRow(name.toUtf8())
-            << true
-            << int(PreGapType::AddToFirstTrack)
-            << ""
-            << requests;
-    //=====================================================
-
-
-    //=====================================================
-    name = "02.2 Without pregap, without HTOA";
-    requests.clear();
-
-    req.clear();
-    req.cueFile     = inDir + "02.cuecreator.cue";
-    req.audioFile   = mAudio_24x96_wav;
-    req.expectedCue = "";
-    req.resultFiles << "01 - Song01.wav : 07bb5c5fbf7b9429c05e9b650d9df467"
-                    << "02 - Song02.wav : 1a199e8e2badff1e643a9f1697ac4140"
-                    << "03 - Song03.wav : 71db07cb54faee8545cbed90fe0be6a3"
-                    << "04 - Song04.wav : 2e5df99b43b96c208ab26983140dd19f"
-                    << "Artist_02-Album.cue";
-    requests << req;
-
-    QTest::newRow(name.toUtf8())
-            << true
-            << int(PreGapType::ExtractToFile)
-            << ""
-            << requests;
-    //=====================================================
-
-
-    //=====================================================
-    name = "03.1 With pregap, without HTOA";
-    requests.clear();
-
-    req.clear();
-    req.cueFile     = inDir + "03.cuecreator.cue";
-    req.audioFile   = mAudio_24x96_wav;
-    req.expectedCue = "";
-    req.resultFiles << "01 - Song01.wav : 07bb5c5fbf7b9429c05e9b650d9df467"
-                    << "02 - Song02.wav : 1a199e8e2badff1e643a9f1697ac4140"
-                    << "03 - Song03.wav : 71db07cb54faee8545cbed90fe0be6a3"
-                    << "04 - Song04.wav : 2e5df99b43b96c208ab26983140dd19f"
-                    << "Artist_03-Album.cue";
-    requests << req;
-
-    QTest::newRow(name.toUtf8())
-            << true
-            << int(PreGapType::AddToFirstTrack)
-            << ""
-            << requests;
-    //=====================================================
-
-
-    //=====================================================
-    name = "04.1 All tags";
-    requests.clear();
-
-    req.clear();
-    req.cueFile     = inDir + "04.cuecreator.cue";
-    req.audioFile   = mAudio_24x96_wav;
-    req.expectedCue = "";
-    req.resultFiles << "01 - Song01.wav : 07bb5c5fbf7b9429c05e9b650d9df467"
-                    << "02 - Song02.wav : 1a199e8e2badff1e643a9f1697ac4140"
-                    << "03 - Song03.wav : 71db07cb54faee8545cbed90fe0be6a3"
-                    << "04 - Song04.wav : 2e5df99b43b96c208ab26983140dd19f"
-                    << "Artist_04-Album.cue";
-    requests << req;
-
-    QTest::newRow(name.toUtf8())
-            << true
-            << int(PreGapType::AddToFirstTrack)
-            << ""
-            << requests;
-    //=====================================================
-
-
-    //=====================================================
-    name = "05.1 Cue without tags + tags form the separate file";
-    requests.clear();
-
-    req.clear();
-    req.cueFile     = inDir + "05.cuecreator.cue";
-    req.audioFile   = mAudio_24x96_wav;
-    req.expectedCue = "";
-    req.resultFiles << "01 - Song Title 01.wav : 07bb5c5fbf7b9429c05e9b650d9df467"
-                    << "02 - Song Title 02.wav : 1a199e8e2badff1e643a9f1697ac4140"
-                    << "03 - Song Title 03.wav : 71db07cb54faee8545cbed90fe0be6a3"
-                    << "04 - Song Title 04.wav : 2e5df99b43b96c208ab26983140dd19f"
-                    << "Artist_05-Album.cue";
-    req.tags        << "01 PERFORMER: Artist_05, ALBUM: Album, GENRE: Genre, DATE: 2013, TITLE: Song Title 01"
-                    << "02 PERFORMER: Artist_05, ALBUM: Album, GENRE: Genre, DATE: 2013, TITLE: Song Title 02"
-                    << "03 PERFORMER: Artist_05, ALBUM: Album, GENRE: Genre, DATE: 2013, TITLE: Song Title 03"
-                    << "04 PERFORMER: Artist_05, ALBUM: Album, GENRE: Genre, DATE: 2013, TITLE: Song Title 04";
-    requests << req;
-
-    QTest::newRow(name.toUtf8())
-            << true
-            << int(PreGapType::AddToFirstTrack)
-            << ""
-            << requests;
-    //=====================================================
-
-
-
-    //=====================================================
-    name = "06.1 Garbage in the CUE";
-    requests.clear();
-
-    req.clear();
-    req.cueFile     = inDir + "06.garbageInTags.cue";
-    req.audioFile   = mAudio_24x96_wav;
-    req.expectedCue = "";
-    req.resultFiles << "01 - Song01.wav : a86e2d59bf1e272b5ab7e9a16009455d"
-                    << "02 - Song02.wav : 1a199e8e2badff1e643a9f1697ac4140"
-                    << "03 - Song03.wav : 71db07cb54faee8545cbed90fe0be6a3"
-                    << "04 - Song04.wav : 2e5df99b43b96c208ab26983140dd19f";
-
-    requests << req;
-    QTest::newRow(name.toUtf8())
-            << false
-            << int(PreGapType::ExtractToFile)
-            << ""
-            << requests;
-    //=====================================================
-
-
-    //=====================================================
-    name = "07.1 with symbols and space";
-    requests.clear();
-
-    req.clear();
-    req.cueFile     = inDir + "07.path(with.symbols and space )/07.path(with.symbols and space ).cue";
-    req.audioFile   = mAudio_24x96_wav +
-                      ":Test_07.path(with.symbols and space )/Audio file (with.symbols and space ).wav";
-    req.expectedCue = "";
-    req.resultFiles << "01 - Song01.wav : a86e2d59bf1e272b5ab7e9a16009455d"
-                    << "02 - Song02.wav : 1a199e8e2badff1e643a9f1697ac4140"
-                    << "03 - Song03.wav : 71db07cb54faee8545cbed90fe0be6a3"
-                    << "04 - Song04.wav : 2e5df99b43b96c208ab26983140dd19f";
-
-    requests << req;
-    QTest::newRow(name.toUtf8())
-            << false
-            << int(PreGapType::ExtractToFile)
-            << ""
-            << requests;
-    //=====================================================
-
-
-    //=====================================================
-    name = "08.1 Test_8/Музыка";
-    requests.clear();
-
-    req.clear();
-    req.cueFile     = inDir + "01.cuecreator.cue";
-    req.audioFile   = mAudio_24x96_wav;
-    req.expectedCue = "";
-    req.resultFiles << "01 - Song01.wav : a86e2d59bf1e272b5ab7e9a16009455d"
-                    << "02 - Song02.wav : 1a199e8e2badff1e643a9f1697ac4140"
-                    << "03 - Song03.wav : 71db07cb54faee8545cbed90fe0be6a3"
-                    << "04 - Song04.wav : 2e5df99b43b96c208ab26983140dd19f";
-
-    requests << req;
-    QTest::newRow(name.toUtf8())
-            << false
-            << int(PreGapType::ExtractToFile)
-            << ""
-            << requests;
-    //=====================================================
-
-
-    //=====================================================
-    name = "09.1 Multi";
-        requests.clear();
-
-    req.clear();
-    req.cueFile     = inDir + "01.cuecreator.cue";
-    req.audioFile   = mAudio_24x96_wav;
-    req.expectedCue = "";
-    req.resultFiles << "01 - Song01.wav : a86e2d59bf1e272b5ab7e9a16009455d"
-                    << "02 - Song02.wav : 1a199e8e2badff1e643a9f1697ac4140"
-                    << "03 - Song03.wav : 71db07cb54faee8545cbed90fe0be6a3"
-                    << "04 - Song04.wav : 2e5df99b43b96c208ab26983140dd19f";
-    requests << req;
-
-
-    req.clear();
-    req.cueFile     = inDir + "02.cuecreator.cue";
-    req.audioFile   = mAudio_24x96_flac;
-    req.expectedCue = inDir + "02.expected.cue";
-    req.resultFiles << "01 - Song01.wav : 07bb5c5fbf7b9429c05e9b650d9df467"
-                    << "02 - Song02.wav : 1a199e8e2badff1e643a9f1697ac4140"
-                    << "03 - Song03.wav : 71db07cb54faee8545cbed90fe0be6a3"
-                    << "04 - Song04.wav : 2e5df99b43b96c208ab26983140dd19f";
-    requests << req;
-
-
-    QTest::newRow(name.toUtf8())
-            << false
-            << int(PreGapType::AddToFirstTrack)
-            << ""
-            << requests;
-    //=====================================================
-
-
-    //=====================================================
-    name ="10.1 Temporary dir";
-    requests.clear();
-
-    req.clear();
-    req.cueFile     = inDir + "01.cuecreator.cue";
-    req.audioFile   = mAudio_24x96_wav;
-    req.expectedCue = "";
-    req.resultFiles << "01 - Song01.wav : a86e2d59bf1e272b5ab7e9a16009455d"
-                    << "02 - Song02.wav : 1a199e8e2badff1e643a9f1697ac4140"
-                    << "03 - Song03.wav : 71db07cb54faee8545cbed90fe0be6a3"
-                    << "04 - Song04.wav : 2e5df99b43b96c208ab26983140dd19f";
-    requests << req;
-
-    QTest::newRow(name.toUtf8())
-            << false
-            << int(PreGapType::ExtractToFile)
-            << "/tmp/tmp/really_tmp"
-            << requests;
-    //=====================================================
+    if (QProcessEnvironment::systemEnvironment().contains("FLACON_SKIP_CONVERT_TEST"))
+        QSKIP("Skipping testConvert");
+
+    QTest::addColumn<QString>("dataDir");
+
+    QString dataDir = mDataDir + "/testConvert/";
+
+    foreach (auto dir, QDir(dataDir).entryList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name))
+    {
+        if (QDir(dataDir + "/" + dir).exists("spec.ini"))
+            QTest::newRow(dir.toUtf8()) << dataDir + "/" + dir;
+    }
 }

flacon-5.0.0.tar.gz/tests/testflacon.cpp -> flacon-5.1.0.tar.gz/tests/testflacon.cpp Changed

@@ -229,27 +229,41 @@
     }
 }
 
+
+/************************************************
+ *
+ ************************************************/
+static QByteArray readCue(const QString &fileName, bool skipEmptyLines)
+{
+
+    QFile file(fileName);
+    file.open(QFile::ReadOnly);
+
+    QByteArray res;
+    res.reserve(file.size());
+    while (!file.atEnd())
+    {
+        QByteArray line = file.readLine().trimmed();
+        if (line.startsWith("REM COMMENT"))
+            continue;
+
+        if (skipEmptyLines && line.isEmpty())
+            continue;
+
+        res += line;
+        res += "\n";
+    }
+    file.close();
+    return res;
+}
+
 /************************************************
 
  ************************************************/
 bool TestFlacon::compareCue(const QString &result, const QString &expected, QString *error, bool skipEmptyLines)
 {
-    QFile resFile(result);
-    resFile.open(QFile::ReadOnly);
-    QByteArray resData = resFile.readAll();
-    resFile.close();
-    resData.replace("\r\n", "\n");
-    if (skipEmptyLines)
-        removeEmptyLines(resData);
-
-
-    QFile expFile(expected);
-    expFile.open(QFile::ReadOnly);
-    QByteArray expData = expFile.readAll();
-    expFile.close();
-    expData.replace("\r\n", "\n");
-    if (skipEmptyLines)
-        removeEmptyLines(expData);
+    QByteArray resData = readCue(result, skipEmptyLines);
+    QByteArray expData = readCue(expected, skipEmptyLines);
 
     if (resData != expData)
     {
@@ -339,7 +353,7 @@
  ************************************************/
 void TestFlacon::testSafeString()
 {
-    QCOMPARE(Disk::safeString("A|B/C|D\\E:F*G?H"), QString("A-B-C-D-E-F-G-H"));
+    QCOMPARE(safeString("A|B/C|D\\E:F*G?H"), QString("A-B-C-D-E-F-G-H"));
 }

flacon-5.0.0.tar.gz/tests/tools.cpp -> flacon-5.1.0.tar.gz/tests/tools.cpp Changed

@@ -33,30 +33,56 @@
 #include <QProcess>
 #include <QCryptographicHash>
 #include <QIODevice>
+#include <QBuffer>
 #include <QDebug>
 #include "../settings.h"
 #include "../cue.h"
 #include "../disk.h"
-
+#include "../converter/decoder.h"
 
 /************************************************
  *
  ************************************************/
 QString calcAudioHash(const QString &fileName)
 {
-    QFile f(fileName);
-    f.open(QFile::ReadOnly);
-    QByteArray ba = f.read(1024);
-    int n = ba.indexOf("data");
-    f.seek(n + 8);
+    Decoder decoder;
+    if (!decoder.open(fileName))
+    {
+        FAIL(QString("Can't open input file '%1': %2").arg(fileName, decoder.errorString()).toLocal8Bit());
+        return "";
+    }
 
-    QCryptographicHash hash(QCryptographicHash::Md5);
-    while (!f.atEnd())
+    if (!decoder.audioFormat())
+    {
+        FAIL("Unknown format");
+        decoder.close();
+        return "";
+    }
+
+    QBuffer buf;
+    buf.open(QBuffer::ReadWrite);
+    bool res = decoder.extract(
+                CueTime(),
+                CueTime(),
+                &buf);
+    if (!res)
     {
-        ba = f.read(1024 * 1024);
-        hash.addData(ba);
+        FAIL(QString("Can't extract file '%1': %2")
+             .arg(fileName)
+             .arg(decoder.errorString()).toLocal8Bit());
+        decoder.close();
+        return "";
     }
 
+    decoder.close();
+
+    buf.reset();
+    QByteArray ba = buf.read(1024);
+    int n = ba.indexOf("data");
+    buf.seek(n + 8);
+
+    QCryptographicHash hash(QCryptographicHash::Md5);
+    hash.addData(&buf);
     return hash.result().toHex();
 }

flacon-5.0.0.tar.gz/track.cpp -> flacon-5.1.0.tar.gz/track.cpp Changed

@@ -70,7 +70,8 @@
  ************************************************/
 Track &Track::operator =(const Track &other)
 {
-    setTags(other);
+    mTags       = other.mTags;
+    mTextCodec  = other.mTextCodec;
     mCueIndexes = other.mCueIndexes;
     mDuration   = other.mDuration;
     mCueFileName= other.mCueFileName;
@@ -80,17 +81,6 @@
 
 
 /************************************************
- *
- ************************************************/
-void Track::setTags(const Track &other)
-{
-    mTags      = other.mTags;
-    mTextCodec = other.mTextCodec;
-}
-
-
-
-/************************************************
 
  ************************************************/
 Track::~Track()
@@ -191,79 +181,40 @@
     int n = pattern.lastIndexOf(QDir::separator());
     if (n < 0)
     {
-        return calcFileName(pattern,
+        return expandPattern(pattern,
                             this->trackCount(),
                             this->trackNum(),
                             this->album(),
                             this->title(),
                             this->artist(),
                             this->genre(),
-                            this->date(),
-                            settings->outFormat()->ext());
+                            this->date())
+                + "." + settings->outFormat()->ext();
     }
 
     // If the disk is a collection, the files fall into different directories.
     // So we use the tag DiskPerformer for expand the directory path.
-    return calcFileName(pattern.left(n),
+    return expandPattern(pattern.left(n),
                         this->trackCount(),
                         this->trackNum(),
                         this->album(),
                         this->title(),
                         this->tag(TagId::AlbumArtist),
                         this->genre(),
-                        this->date(),
-                        "")
+                        this->date())
 
             +
 
-            calcFileName(pattern.mid(n),
+            expandPattern(pattern.mid(n),
                          this->trackCount(),
                          this->trackNum(),
                          this->album(),
                          this->title(),
                          this->artist(),
                          this->genre(),
-                         this->date(),
-                         settings->outFormat()->ext());
-
-
-
-
-
-}
-
-
-/************************************************
-  %N  Number of tracks       %n  Track number
-  %a  Artist                 %A  Album title
-  %y  Year                   %g  Genre
-  %t  Track title
- ************************************************/
-QString Track::calcFileName(const QString &pattern,
-                            int trackCount,
-                            int trackNum,
-                            const QString &album,
-                            const QString &title,
-                            const QString &artist,
-                            const QString &genre,
-                            const QString &date,
-                            const QString &fileExt)
-{
-    QHash<QChar, QString> tokens;
-    tokens.insert(QChar('N'),   QString("%1").arg(trackCount, 2, 10, QChar('0')));
-    tokens.insert(QChar('n'),   QString("%1").arg(trackNum, 2, 10, QChar('0')));
-    tokens.insert(QChar('A'),   Disk::safeString(album));
-    tokens.insert(QChar('t'),   Disk::safeString(title));
-    tokens.insert(QChar('a'),   Disk::safeString(artist));
-    tokens.insert(QChar('g'),   Disk::safeString(genre));
-    tokens.insert(QChar('y'),   Disk::safeString(date));
-
-    QString res = expandPattern(pattern, &tokens, false);
+                         this->date())
 
-    if (fileExt.isEmpty())
-        return res;
-
-    return res + "." + fileExt;
+            + "." + settings->outFormat()->ext();
 }
 
 
@@ -379,100 +330,6 @@
 /************************************************
 
  ************************************************/
-QString Track::expandPattern(const QString &pattern, const QHash<QChar, QString> *tokens, bool optional)
-{
-    QString res;
-    bool perc = false;
-    bool hasVars = false;
-    bool isValid = true;
-
-
-    for(int i=0; i<pattern.length(); ++i)
-    {
-        QChar c = pattern.at(i);
-
-
-        // Sub pattern .................................
-        if (c == '{')
-        {
-            int level = 0;
-            int start = i + 1;
-            //int j = i;
-            QString s = "{";
-
-            for (int j=i; j<pattern.length(); ++j)
-            {
-                c = pattern.at(j);
-                if (c == '{')
-                    level++;
-                else if (c == '}')
-                    level--;
-
-                if (level == 0)
-                {
-                    s = expandPattern(pattern.mid(start, j - start), tokens, true);
-                    i = j;
-                    break;
-                }
-            }
-            res += s;
-        }
-        // Sub pattern .................................
-
-        else
-        {
-            if (perc)
-            {
-                perc = false;
-                if (tokens->contains(c))
-                {
-                    QString s = tokens->value(c);
-                    hasVars = true;
-                    isValid = !s.isEmpty();
-                    res += s;
-                }
-                else
-                {
-                    if (c == '%')
-                        res += "%";
-                    else
-                        res += QString("%") + c;
-                }
-            }
-            else
-            {
-                if (c == '%')
-                    perc = true;
-                else
-                    res += c;
-            }
-        }
-    }
-
-    if (perc)
-        res += "%";
-
-    if (optional)
-    {
-        if  (hasVars)
-        {
-            if (!isValid)
-                return "";
-        }
-        else
-        {
-            return "{" + res + "}";
-        }
-    }
-
-    return res;
-}
-
-
-
-/************************************************
-
- ************************************************/
 QString Track::resultFilePath() const
 {
     QString fileName = resultFileName();

flacon-5.0.0.tar.gz/track.h -> flacon-5.1.0.tar.gz/track.h Changed

@@ -42,7 +42,6 @@
     Track();
     Track(const Track &other);
     Track &operator =(const Track &other);
-    void setTags(const Track &other);
     ~Track();
 
     QString tag(const TagId &tagId) const;
@@ -100,17 +99,6 @@
     CueIndex cueIndex(int indexNum) const;
     void setCueIndex(int indexNum, const CueIndex &value);
 
-
-    static QString calcFileName(const QString &pattern,
-                                int trackCount,
-                                int trackNum,
-                                const QString &album,
-                                const QString &title,
-                                const QString &artist,
-                                const QString &genre,
-                                const QString &date,
-                                const QString &fileExt);
-
     QString cueFileName() const { return mCueFileName; }
     void setCueFileName(const QString &value) { mCueFileName = value; }
 
@@ -125,7 +113,6 @@
     QString mCueFileName;
 
     QString calcResultFilePath() const;
-    static QString expandPattern(const QString &pattern, const QHash<QChar,QString> *tokens, bool optional);
 };

flacon-5.0.0.tar.gz/translations/flacon_cs.desktop -> flacon-5.1.0.tar.gz/translations/flacon_cs.desktop Changed

flacon-5.0.0.tar.gz/translations/flacon_cs.ts -> flacon-5.1.0.tar.gz/translations/flacon_cs.ts Changed

@@ -352,6 +352,32 @@
         <comment>Item in combobox</comment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>File name format:</source>
+        <extracomment>Settings dialog, label for the edit control with name of the created CUE file.</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert &quot;Artist&quot;</source>
+        <translation>Vložit &quot;Umělec&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Album title&quot;</source>
+        <translation>Vložit &quot;Název alba&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Year&quot;</source>
+        <translation>Vložit &quot;Rok&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Genre&quot;</source>
+        <translation>Vložit &quot;Žánr&quot;</translation>
+    </message>
+    <message>
+        <source>Use &quot;%1&quot;</source>
+        <comment>Predefined CUE file name, string like 'Use &quot;%a/%A/%n - %t.cue&quot;'</comment>
+        <translation>Použít &quot;%1&quot;</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -1119,6 +1145,21 @@
         <source>Album performer:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Convert selected</source>
+        <extracomment>Main menu item</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Start conversion process for the selected tracks</source>
+        <extracomment>Main menu item tooltip</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ctrl+Shift+W</source>
+        <extracomment>Main menu item shortcut</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>

flacon-5.0.0.tar.gz/translations/flacon_cs_CZ.desktop -> flacon-5.1.0.tar.gz/translations/flacon_cs_CZ.desktop Changed

flacon-5.0.0.tar.gz/translations/flacon_cs_CZ.ts -> flacon-5.1.0.tar.gz/translations/flacon_cs_CZ.ts Changed

@@ -352,6 +352,32 @@
         <comment>Item in combobox</comment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>File name format:</source>
+        <extracomment>Settings dialog, label for the edit control with name of the created CUE file.</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert &quot;Artist&quot;</source>
+        <translation>Vložit &quot;Umělec&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Album title&quot;</source>
+        <translation>Vložit &quot;Název alba&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Year&quot;</source>
+        <translation>Vložit &quot;Rok&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Genre&quot;</source>
+        <translation>Vložit &quot;Žánr&quot;</translation>
+    </message>
+    <message>
+        <source>Use &quot;%1&quot;</source>
+        <comment>Predefined CUE file name, string like 'Use &quot;%a/%A/%n - %t.cue&quot;'</comment>
+        <translation>Použít &quot;%1&quot;</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -1096,6 +1122,21 @@
         <source>Album performer:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Convert selected</source>
+        <extracomment>Main menu item</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Start conversion process for the selected tracks</source>
+        <extracomment>Main menu item tooltip</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ctrl+Shift+W</source>
+        <extracomment>Main menu item shortcut</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>

flacon-5.0.0.tar.gz/translations/flacon_de.desktop -> flacon-5.1.0.tar.gz/translations/flacon_de.desktop Changed

flacon-5.0.0.tar.gz/translations/flacon_de.ts -> flacon-5.1.0.tar.gz/translations/flacon_de.ts Changed

@@ -352,6 +352,32 @@
         <comment>Item in combobox</comment>
         <translation>32 Bit</translation>
     </message>
+    <message>
+        <source>File name format:</source>
+        <extracomment>Settings dialog, label for the edit control with name of the created CUE file.</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert &quot;Artist&quot;</source>
+        <translation>&quot;Interpret&quot; einfügen</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Album title&quot;</source>
+        <translation>&quot;Albumtitel&quot; einfügen</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Year&quot;</source>
+        <translation>&quot;Jahr&quot; einfügen</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Genre&quot;</source>
+        <translation>&quot;Genre&quot; einfügen</translation>
+    </message>
+    <message>
+        <source>Use &quot;%1&quot;</source>
+        <comment>Predefined CUE file name, string like 'Use &quot;%a/%A/%n - %t.cue&quot;'</comment>
+        <translation>&quot;%1&quot; verwenden</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -1122,6 +1148,21 @@
         <source>Album performer:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Convert selected</source>
+        <extracomment>Main menu item</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Start conversion process for the selected tracks</source>
+        <extracomment>Main menu item tooltip</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ctrl+Shift+W</source>
+        <extracomment>Main menu item shortcut</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>

flacon-5.0.0.tar.gz/translations/flacon_el.desktop -> flacon-5.1.0.tar.gz/translations/flacon_el.desktop Changed

flacon-5.0.0.tar.gz/translations/flacon_el.ts -> flacon-5.1.0.tar.gz/translations/flacon_el.ts Changed

@@ -352,6 +352,32 @@
         <comment>Item in combobox</comment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>File name format:</source>
+        <extracomment>Settings dialog, label for the edit control with name of the created CUE file.</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert &quot;Artist&quot;</source>
+        <translation>Εισαγωγή &quot;Καλλιτέχνης&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Album title&quot;</source>
+        <translation>Εισαγωγή &quot;Τίτλος άλμπουμ&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Year&quot;</source>
+        <translation>Εισαγωγή &quot;Έτος&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Genre&quot;</source>
+        <translation>Εισαγωγή &quot;Είδος&quot;</translation>
+    </message>
+    <message>
+        <source>Use &quot;%1&quot;</source>
+        <comment>Predefined CUE file name, string like 'Use &quot;%a/%A/%n - %t.cue&quot;'</comment>
+        <translation>Χρήση τού &quot;%1&quot;</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -1122,6 +1148,21 @@
         <source>Album performer:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Convert selected</source>
+        <extracomment>Main menu item</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Start conversion process for the selected tracks</source>
+        <extracomment>Main menu item tooltip</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ctrl+Shift+W</source>
+        <extracomment>Main menu item shortcut</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>

flacon-5.0.0.tar.gz/translations/flacon_es.desktop -> flacon-5.1.0.tar.gz/translations/flacon_es.desktop Changed

flacon-5.0.0.tar.gz/translations/flacon_es.ts -> flacon-5.1.0.tar.gz/translations/flacon_es.ts Changed

@@ -326,31 +326,57 @@
     </message>
     <message>
         <source>Per track CUE sheet</source>
-        <translation type="unfinished"/>
+        <translation>Hoja CUE por pista</translation>
     </message>
     <message>
         <source>Create per track CUE sheet</source>
-        <translation type="unfinished"/>
+        <translation>Crear hoja CUE por pista</translation>
     </message>
     <message>
         <source>Same as source</source>
         <comment>Item in combobox</comment>
-        <translation type="unfinished"/>
+        <translation>Igual a la fuente</translation>
     </message>
     <message>
         <source>16-bit</source>
         <comment>Item in combobox</comment>
-        <translation type="unfinished"/>
+        <translation>16-bit</translation>
     </message>
     <message>
         <source>24-bit</source>
         <comment>Item in combobox</comment>
-        <translation type="unfinished"/>
+        <translation>24-bit</translation>
     </message>
     <message>
         <source>32-bit</source>
         <comment>Item in combobox</comment>
-        <translation type="unfinished"/>
+        <translation>32-bit</translation>
+    </message>
+    <message>
+        <source>File name format:</source>
+        <extracomment>Settings dialog, label for the edit control with name of the created CUE file.</extracomment>
+        <translation>Formato de nombre de archivo</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Artist&quot;</source>
+        <translation>Insertar &quot;Artista&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Album title&quot;</source>
+        <translation>Insertar &quot;Título de álbum&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Year&quot;</source>
+        <translation>Insertar &quot;Año&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Genre&quot;</source>
+        <translation>Insertar &quot;Género&quot;</translation>
+    </message>
+    <message>
+        <source>Use &quot;%1&quot;</source>
+        <comment>Predefined CUE file name, string like 'Use &quot;%a/%A/%n - %t.cue&quot;'</comment>
+        <translation>Usar &quot;%1&quot;</translation>
     </message>
 </context>
 <context>
@@ -690,17 +716,17 @@
     </message>
     <message>
         <source>Audio file shorter than expected from CUE sheet.</source>
-        <translation type="unfinished"/>
+        <translation>El archivo de audio es más pequeño de lo esperado por la hoja CUE.</translation>
     </message>
     <message>
         <source>A maximum of %1-bit per sample is supported by this format. This value will be used for encoding.</source>
         <comment>Warning message</comment>
-        <translation type="unfinished"/>
+        <translation>Este formato soporta un máximo de %1-bit por muestreo. Este valor será que se usará para la codificación.</translation>
     </message>
     <message>
         <source>A maximum sample rate of %1 is supported by this format. This value will be used for encoding.</source>
         <comment>Warning message</comment>
-        <translation type="unfinished"/>
+        <translation>El formato soporta una tasa de muestreo máxima de %1, valor que se usará para la codificación.</translation>
     </message>
 </context>
 <context>
@@ -1089,38 +1115,53 @@
     <message>
         <source>Edit all tags…</source>
         <comment>Button text</comment>
-        <translation type="unfinished"/>
+        <translation>Editar todas las etiquetas...</translation>
     </message>
     <message>
         <source>Add disk…</source>
-        <translation type="unfinished"/>
+        <translation>Agregar disco...</translation>
     </message>
     <message>
         <source>Select directory…</source>
-        <translation type="unfinished"/>
+        <translation>Seleccione directorio...</translation>
     </message>
     <message>
         <source>Check for Updates…</source>
-        <translation type="unfinished"/>
+        <translation>Comprobar actualizaciones...</translation>
     </message>
     <message>
         <source>Edit tags…</source>
         <comment>context menu</comment>
-        <translation type="unfinished"/>
+        <translation>Editar etiquetas...</translation>
     </message>
     <message>
         <source>Select another audio file…</source>
         <comment>context menu</comment>
-        <translation type="unfinished"/>
+        <translation>Seleccione otro archivo de audio...</translation>
     </message>
     <message>
         <source>Select another CUE file…</source>
         <comment>context menu</comment>
-        <translation type="unfinished"/>
+        <translation>Seleccione otro archivo CUE...</translation>
     </message>
     <message>
         <source>Album performer:</source>
-        <translation type="unfinished"/>
+        <translation>Artista del álbum:</translation>
+    </message>
+    <message>
+        <source>Convert selected</source>
+        <extracomment>Main menu item</extracomment>
+        <translation>Convertir selección</translation>
+    </message>
+    <message>
+        <source>Start conversion process for the selected tracks</source>
+        <extracomment>Main menu item tooltip</extracomment>
+        <translation>Comenzar proceso de conversión para las pistas seleccionadas</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+W</source>
+        <extracomment>Main menu item shortcut</extracomment>
+        <translation>Ctrl+Mayúsculas+W</translation>
     </message>
 </context>
 <context>
@@ -1221,25 +1262,25 @@
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; is not a valid CUE file. Incorrect track number on line %2.</source>
         <comment>Cue parser error.</comment>
-        <translation type="unfinished"/>
+        <translation>&lt;b&gt;%1&lt;/b&gt; no es una archivo CUE válido. Número de pista incorrecto en la línea %2.</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; is not a valid CUE file. Incorrect track index on line %2.</source>
         <comment>Cue parser error.</comment>
-        <translation type="unfinished"/>
+        <translation>&lt;b&gt;%1&lt;/b&gt; no es un archivo CUE válido. Índice de pista incorrecto en la línea %2.</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; is not a valid CUE file. The CUE sheet has no FILE tag.</source>
-        <translation type="unfinished"/>
+        <translation>&lt;b&gt;%1&lt;/b&gt; no es un archivo CUE válido. La hoja CUE no tiene la etiqueta FILE.</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; is not a valid CUE file. Disk %2 has no tags.</source>
-        <translation type="unfinished"/>
+        <translation>&lt;b&gt;%1&lt;/b&gt; no es un archivo CUE válido. El disco %2 no tiene etiquetas.</translation>
     </message>
     <message>
         <source>I can&apos;t save cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
         <comment>%1 - is file name, %2 - an error text</comment>
-        <translation type="unfinished"/>
+        <translation>No puedo guardar la imagen de portada &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</translation>
     </message>
 </context>
 <context>
@@ -1304,7 +1345,7 @@
     <message>
         <source>Album performer:</source>
         <comment>Music tag name</comment>
-        <translation type="unfinished"/>
+        <translation>Artista del Álbum:</translation>
     </message>
 </context>
 <context>
@@ -1315,7 +1356,7 @@
     </message>
     <message>
         <source>Select another CUE file…</source>
-        <translation type="unfinished"/>
+        <translation>Seleccione otro archivo CUE...</translation>
     </message>
 </context>
 <context>

flacon-5.0.0.tar.gz/translations/flacon_es_MX.desktop -> flacon-5.1.0.tar.gz/translations/flacon_es_MX.desktop Changed

flacon-5.0.0.tar.gz/translations/flacon_es_MX.ts -> flacon-5.1.0.tar.gz/translations/flacon_es_MX.ts Changed

@@ -299,22 +299,22 @@
     <message>
         <source>44100 Hz</source>
         <comment>Item in combobox</comment>
-        <translation type="unfinished"/>
+        <translation>44100 Hz</translation>
     </message>
     <message>
         <source>48000 Hz</source>
         <comment>Item in combobox</comment>
-        <translation type="unfinished"/>
+        <translation>48000 Hz</translation>
     </message>
     <message>
         <source>96000 Hz</source>
         <comment>Item in combobox</comment>
-        <translation type="unfinished"/>
+        <translation>96000 Hz</translation>
     </message>
     <message>
         <source>192000 Hz</source>
         <comment>Item in combobox</comment>
-        <translation type="unfinished"/>
+        <translation>192000 Hz</translation>
     </message>
     <message>
         <source>Maximum bit depth:</source>
@@ -326,32 +326,58 @@
     </message>
     <message>
         <source>Per track CUE sheet</source>
-        <translation type="unfinished"/>
+        <translation>Hoja CUE por pista</translation>
     </message>
     <message>
         <source>Create per track CUE sheet</source>
-        <translation type="unfinished"/>
+        <translation>Crear hoja CUE por pista</translation>
     </message>
     <message>
         <source>Same as source</source>
         <comment>Item in combobox</comment>
-        <translation type="unfinished"/>
+        <translation>Igual que el origen</translation>
     </message>
     <message>
         <source>16-bit</source>
         <comment>Item in combobox</comment>
-        <translation type="unfinished"/>
+        <translation>16-bit</translation>
     </message>
     <message>
         <source>24-bit</source>
         <comment>Item in combobox</comment>
-        <translation type="unfinished"/>
+        <translation>24-bit</translation>
     </message>
     <message>
         <source>32-bit</source>
         <comment>Item in combobox</comment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>File name format:</source>
+        <extracomment>Settings dialog, label for the edit control with name of the created CUE file.</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert &quot;Artist&quot;</source>
+        <translation>Introduzca &quot;artista&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Album title&quot;</source>
+        <translation>Introduzca &quot;título de álbum&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Year&quot;</source>
+        <translation>Introduzca &quot;año&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Genre&quot;</source>
+        <translation>Introduzca &quot;género&quot;</translation>
+    </message>
+    <message>
+        <source>Use &quot;%1&quot;</source>
+        <comment>Predefined CUE file name, string like 'Use &quot;%a/%A/%n - %t.cue&quot;'</comment>
+        <translation>Use &quot;%1&quot;</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -667,7 +693,7 @@
     </message>
     <message>
         <source>Audio file shorter than expected from CUE sheet.</source>
-        <translation type="unfinished"/>
+        <translation>Archivo de audio más corto que el esperado de la hoja CUE</translation>
     </message>
     <message>
         <source>A maximum of %1-bit per sample is supported by this format. This value will be used for encoding.</source>
@@ -1036,16 +1062,16 @@
     <message>
         <source>Desktop</source>
         <comment>Menu item for output direcory button</comment>
-        <translation type="unfinished"/>
+        <translation>Escritorio</translation>
     </message>
     <message>
         <source>Same directory as CUE file</source>
         <comment>Menu item for output direcory button</comment>
-        <translation type="unfinished"/>
+        <translation>Mismo directorio que el archivo CUE</translation>
     </message>
     <message>
         <source>Remove current directory from history</source>
-        <translation type="unfinished"/>
+        <translation>Remover directorio actual del historial</translation>
     </message>
     <message>
         <source>Get data from CDDB</source>
@@ -1065,39 +1091,54 @@
     <message>
         <source>Edit all tags…</source>
         <comment>Button text</comment>
-        <translation type="unfinished"/>
+        <translation>Editar todas las etiquetas...</translation>
     </message>
     <message>
         <source>Add disk…</source>
-        <translation type="unfinished"/>
+        <translation>Agregar disco...</translation>
     </message>
     <message>
         <source>Select directory…</source>
-        <translation type="unfinished"/>
+        <translation>Seleccionar directorio...</translation>
     </message>
     <message>
         <source>Check for Updates…</source>
-        <translation type="unfinished"/>
+        <translation>Buscar actualizaciones...</translation>
     </message>
     <message>
         <source>Edit tags…</source>
         <comment>context menu</comment>
-        <translation type="unfinished"/>
+        <translation>Editar etiquetas...</translation>
     </message>
     <message>
         <source>Select another audio file…</source>
         <comment>context menu</comment>
-        <translation type="unfinished"/>
+        <translation>Seleccione otro archivo de audio...</translation>
     </message>
     <message>
         <source>Select another CUE file…</source>
         <comment>context menu</comment>
-        <translation type="unfinished"/>
+        <translation>Seleccione otro archivo CUE...</translation>
     </message>
     <message>
         <source>Album performer:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Convert selected</source>
+        <extracomment>Main menu item</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Start conversion process for the selected tracks</source>
+        <extracomment>Main menu item tooltip</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ctrl+Shift+W</source>
+        <extracomment>Main menu item shortcut</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>
@@ -1197,12 +1238,12 @@
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; is not a valid CUE file. Incorrect track number on line %2.</source>
         <comment>Cue parser error.</comment>
-        <translation type="unfinished"/>
+        <translation>&lt;b&gt;%1&lt;/b&gt; no es un archivo CUE válido. Número incorrecto de pistas en la línea %2.</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; is not a valid CUE file. Incorrect track index on line %2.</source>
         <comment>Cue parser error.</comment>
-        <translation type="unfinished"/>
+        <translation>&lt;b&gt;%1&lt;/b&gt; no es un archivo CUE válido. Índice incorrecto de pista en la línea %2.</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; is not a valid CUE file. The CUE sheet has no FILE tag.</source>
@@ -1215,7 +1256,7 @@
     <message>
         <source>I can&apos;t save cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
         <comment>%1 - is file name, %2 - an error text</comment>
-        <translation type="unfinished"/>
+        <translation>No puedo guardar la imagen de cubierta &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</translation>
     </message>
 </context>
 <context>
@@ -1231,11 +1272,11 @@
     <message>
         <source>Edit tags</source>
         <comment>Dialog title</comment>
-        <translation type="unfinished"/>
+        <translation>Editar etiquetas</translation>
     </message>
     <message>
         <source>of</source>
-        <translation type="unfinished"/>
+        <translation>de</translation>
     </message>
     <message>
         <source>Artist:</source>
@@ -1260,17 +1301,17 @@
     <message>
         <source>Disk number:</source>
         <comment>Music tag name</comment>
-        <translation type="unfinished"/>
+        <translation>Número de disco:</translation>
     </message>
     <message>
         <source>Track title:</source>
         <comment>Music tag name</comment>
-        <translation type="unfinished"/>
+        <translation>Título de pista:</translation>
     </message>
     <message>
         <source>Comment:</source>
         <comment>Music tag name</comment>
-        <translation type="unfinished"/>
+        <translation>Comentario:</translation>
     </message>
     <message>
         <source>Start track number:</source>
@@ -1291,7 +1332,7 @@
     </message>
     <message>
         <source>Select another CUE file…</source>
-        <translation type="unfinished"/>
+        <translation>Seleccione otro archivo CUE...</translation>
     </message>
 </context>
 <context>

flacon-5.0.0.tar.gz/translations/flacon_et.ts -> flacon-5.1.0.tar.gz/translations/flacon_et.ts Changed

@@ -352,6 +352,32 @@
         <comment>Item in combobox</comment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>File name format:</source>
+        <extracomment>Settings dialog, label for the edit control with name of the created CUE file.</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert &quot;Artist&quot;</source>
+        <translation>Lisa &quot;Esitaja&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Album title&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert &quot;Year&quot;</source>
+        <translation>Lisa &quot;Aasta&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Genre&quot;</source>
+        <translation>Lisa &quot;Žanr&quot;</translation>
+    </message>
+    <message>
+        <source>Use &quot;%1&quot;</source>
+        <comment>Predefined CUE file name, string like 'Use &quot;%a/%A/%n - %t.cue&quot;'</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -1064,6 +1090,21 @@
         <source>Album performer:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Convert selected</source>
+        <extracomment>Main menu item</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Start conversion process for the selected tracks</source>
+        <extracomment>Main menu item tooltip</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ctrl+Shift+W</source>
+        <extracomment>Main menu item shortcut</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>

flacon-5.0.0.tar.gz/translations/flacon_fr.desktop -> flacon-5.1.0.tar.gz/translations/flacon_fr.desktop Changed

flacon-5.0.0.tar.gz/translations/flacon_fr.ts -> flacon-5.1.0.tar.gz/translations/flacon_fr.ts Changed

@@ -352,6 +352,32 @@
         <comment>Item in combobox</comment>
         <translation>32 bits</translation>
     </message>
+    <message>
+        <source>File name format:</source>
+        <extracomment>Settings dialog, label for the edit control with name of the created CUE file.</extracomment>
+        <translation>Format du nom de fichier :</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Artist&quot;</source>
+        <translation>Insérer l’« Artiste »</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Album title&quot;</source>
+        <translation>Insérer le « Titre de l’album »</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Year&quot;</source>
+        <translation>Insérer l’« Année »</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Genre&quot;</source>
+        <translation>Insérer le « Genre »</translation>
+    </message>
+    <message>
+        <source>Use &quot;%1&quot;</source>
+        <comment>Predefined CUE file name, string like 'Use &quot;%a/%A/%n - %t.cue&quot;'</comment>
+        <translation>Utiliser « %1 »</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -1120,6 +1146,21 @@
         <source>Album performer:</source>
         <translation>Interprète de l’album :</translation>
     </message>
+    <message>
+        <source>Convert selected</source>
+        <extracomment>Main menu item</extracomment>
+        <translation>Convertir la sélection</translation>
+    </message>
+    <message>
+        <source>Start conversion process for the selected tracks</source>
+        <extracomment>Main menu item tooltip</extracomment>
+        <translation>Lancer le processus de conversion pour les pistes sélectionnées</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+W</source>
+        <extracomment>Main menu item shortcut</extracomment>
+        <translation>Ctrl+Maj+W</translation>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>
@@ -1328,7 +1369,7 @@
     </message>
     <message>
         <source>OK</source>
-        <translation>Valider</translation>
+        <translation>Validé</translation>
     </message>
     <message>
         <source>Extracting</source>

flacon-5.0.0.tar.gz/translations/flacon_gl.desktop -> flacon-5.1.0.tar.gz/translations/flacon_gl.desktop Changed

flacon-5.0.0.tar.gz/translations/flacon_gl.ts -> flacon-5.1.0.tar.gz/translations/flacon_gl.ts Changed

@@ -352,6 +352,32 @@
         <comment>Item in combobox</comment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>File name format:</source>
+        <extracomment>Settings dialog, label for the edit control with name of the created CUE file.</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert &quot;Artist&quot;</source>
+        <translation>Inserir o «Artista»</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Album title&quot;</source>
+        <translation>Inserir o «Título do álbum»</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Year&quot;</source>
+        <translation>Inserir o «Ano»</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Genre&quot;</source>
+        <translation>Inserir o «Xénero»</translation>
+    </message>
+    <message>
+        <source>Use &quot;%1&quot;</source>
+        <comment>Predefined CUE file name, string like 'Use &quot;%a/%A/%n - %t.cue&quot;'</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -1095,6 +1121,21 @@
         <source>Album performer:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Convert selected</source>
+        <extracomment>Main menu item</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Start conversion process for the selected tracks</source>
+        <extracomment>Main menu item tooltip</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ctrl+Shift+W</source>
+        <extracomment>Main menu item shortcut</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>

flacon-5.0.0.tar.gz/translations/flacon_he.desktop -> flacon-5.1.0.tar.gz/translations/flacon_he.desktop Changed

flacon-5.0.0.tar.gz/translations/flacon_he.ts -> flacon-5.1.0.tar.gz/translations/flacon_he.ts Changed

@@ -3,7 +3,7 @@
     <name>AboutDialog</name>
     <message>
         <source>About Flacon</source>
-        <translation>אודות Flacon</translation>
+        <translation>אודות פלאקון</translation>
     </message>
     <message>
         <source>About</source>
@@ -19,7 +19,7 @@
     </message>
     <message>
         <source>Translations</source>
-        <translation>תירגום</translation>
+        <translation>תרגום</translation>
     </message>
     <message>
         <source>External programs</source>
@@ -39,7 +39,7 @@
     </message>
     <message>
         <source>Flacon uses external programs. Many thanks to their authors!</source>
-        <translation>Flacon עושה שימוש בתוכנות צד שלישי. הרבה תודה ליוצריהן!</translation>
+        <translation>פלאקון עושה שימוש בתוכנות צד שלישי. הרבה תודה ליוצריהן!</translation>
     </message>
     <message>
         <source>Extracts individual tracks from one big audio file containing the entire album.</source>
@@ -51,7 +51,7 @@
     </message>
     <message>
         <source>WavPack support patch</source>
-        <translation>תיקון תמיכת WavPack</translation>
+        <translation>תיקון לתמיכת WavPack</translation>
     </message>
     <message>
         <source>Packaging, testing</source>
@@ -63,16 +63,16 @@
     </message>
     <message>
         <source>Flacon account on github.com</source>
-        <translation>חשבון Flacon ב github.com</translation>
+        <translation>חשבון פלאקון ב github.com</translation>
     </message>
     <message>
         <source>Bug tracker %1</source>
         <comment>About dialog, About tab</comment>
-        <translation>מעקב תקלות %1</translation>
+        <translation>מעקב תקלים: %1</translation>
     </message>
     <message>
         <source>Flacon is translated into many languages thanks to the work of the Flacon translation teams on &lt;a href=&apos;%1&apos;&gt;Transifex&lt;/a&gt;.</source>
-        <translation>Flacon מתורגם לשפות רבות בזכות עבודתם של צוותי התרגום של Flacon באמצעות &lt;a href=&apos;%1&apos;&gt; Transifex &lt;/a&gt;.</translation>
+        <translation>פלאקון מתורגם לשפות רבות בזכות עבודתם של צוותי התרגום של פלאקון באמצעות &lt;a href=&apos;%1&apos;&gt; Transifex &lt;/a&gt;.</translation>
     </message>
 </context>
 <context>
@@ -203,7 +203,7 @@
     </message>
     <message>
         <source>Thread count:</source>
-        <translation>מספר שרשורים:</translation>
+        <translation>מונה שרשורים:</translation>
     </message>
     <message>
         <source>The number of threads in the conversion process.</source>
@@ -211,7 +211,7 @@
     </message>
     <message>
         <source>First track pregap:</source>
-        <translation>מרווח מקדים רצועה ראשונה:</translation>
+        <translation>מרווח מקדים ברצועה ראשונה:</translation>
     </message>
     <message>
         <source>Rescan</source>
@@ -227,7 +227,7 @@
     </message>
     <message>
         <source>Add to first track</source>
-        <translation>הוספת לרצועה הראשונה</translation>
+        <translation>הוספה לרצועה הראשונה</translation>
     </message>
     <message>
         <source>General</source>
@@ -251,7 +251,7 @@
     </message>
     <message>
         <source>Default codepage:</source>
-        <translation>דף קידוד ברירת מחדל</translation>
+        <translation>קידוד ברירת מחדל</translation>
     </message>
     <message>
         <source>Cover image</source>
@@ -259,7 +259,7 @@
     </message>
     <message>
         <source>Do not copy image</source>
-        <translation>תמונה לא הועתקה</translation>
+        <translation>לא להעתיק תמונה</translation>
     </message>
     <message>
         <source>Update</source>
@@ -352,6 +352,32 @@
         <comment>Item in combobox</comment>
         <translation>32 ביט</translation>
     </message>
+    <message>
+        <source>File name format:</source>
+        <extracomment>Settings dialog, label for the edit control with name of the created CUE file.</extracomment>
+        <translation>תבנית שם קובץ:</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Artist&quot;</source>
+        <translation>הזנת &quot;אמן&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Album title&quot;</source>
+        <translation>הזנת &quot;שם אלבום&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Year&quot;</source>
+        <translation>הזנת &quot;שנה&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Genre&quot;</source>
+        <translation>הזנת &quot;סוגה&quot;</translation>
+    </message>
+    <message>
+        <source>Use &quot;%1&quot;</source>
+        <comment>Predefined CUE file name, string like 'Use &quot;%a/%A/%n - %t.cue&quot;'</comment>
+        <translation>משתמש ב &quot;%1&quot;</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -781,7 +807,7 @@
     <name>MainWindow</name>
     <message>
         <source>Flacon</source>
-        <translation>Flacon</translation>
+        <translation>פלאקון</translation>
     </message>
     <message>
         <source>Result Files</source>
@@ -826,7 +852,7 @@
     </message>
     <message>
         <source>Start num:</source>
-        <translation>מספר התחלה:</translation>
+        <translation>להתחיל מרצועה:</translation>
     </message>
     <message>
         <source>Disc ID:</source>
@@ -834,7 +860,7 @@
     </message>
     <message>
         <source>Codepage:</source>
-        <translation>דף קידוד:</translation>
+        <translation>קידוד:</translation>
     </message>
     <message>
         <source>&amp;File</source>
@@ -858,7 +884,7 @@
     </message>
     <message>
         <source>Convert</source>
-        <translation>להמיר</translation>
+        <translation>המרה</translation>
     </message>
     <message>
         <source>Start conversion process</source>
@@ -870,7 +896,7 @@
     </message>
     <message>
         <source>Abort</source>
-        <translation>לבטל</translation>
+        <translation>ביטול</translation>
     </message>
     <message>
         <source>Abort conversion process</source>
@@ -902,11 +928,11 @@
     </message>
     <message>
         <source>Get from CDDB</source>
-        <translation>מביא מ CDDB</translation>
+        <translation>אחזור מ CDDB</translation>
     </message>
     <message>
         <source>Get album information from CDDB</source>
-        <translation>הבאת נתוני אלבום מ CDDB</translation>
+        <translation>אחזור נתוני אלבום מ CDDB</translation>
     </message>
     <message>
         <source>Ctrl+I</source>
@@ -1050,7 +1076,7 @@
     </message>
     <message>
         <source>About Flacon</source>
-        <translation>אודות Flacon</translation>
+        <translation>אודות פלאקון</translation>
     </message>
     <message>
         <source>Standard music location</source>
@@ -1074,7 +1100,7 @@
     <message>
         <source>Get data from CDDB</source>
         <comment>context menu</comment>
-        <translation>הבאת נתונים מ CDDB</translation>
+        <translation>אחזור נתונים מ CDDB</translation>
     </message>
     <message>
         <source>Select CUE file</source>
@@ -1120,7 +1146,22 @@
     </message>
     <message>
         <source>Album performer:</source>
-        <translation>מבצע תקליטור:</translation>
+        <translation>מבצע:</translation>
+    </message>
+    <message>
+        <source>Convert selected</source>
+        <extracomment>Main menu item</extracomment>
+        <translation>המרת רצועות שנבחרו</translation>
+    </message>
+    <message>
+        <source>Start conversion process for the selected tracks</source>
+        <extracomment>Main menu item tooltip</extracomment>
+        <translation>התחלת תהליך ההמרה של הרצועות שנבחרו</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+W</source>
+        <extracomment>Main menu item shortcut</extracomment>
+        <translation>Ctrl+Shift+W</translation>
     </message>
 </context>
 <context>
@@ -1174,7 +1215,7 @@
     <message>
         <source>Flacon</source>
         <comment>Error</comment>
-        <translation>Flacon</translation>
+        <translation>פלאקון</translation>
     </message>
     <message>
         <source>File &lt;b&gt;&quot;%1&quot;&lt;/b&gt; does not exist</source>
@@ -1299,7 +1340,7 @@
     <message>
         <source>Start track number:</source>
         <comment>Music tag name</comment>
-        <translation>מספר רצועת התחלה:</translation>
+        <translation>להתחיל מרצועה מספר:</translation>
     </message>
     <message>
         <source>Album performer:</source>
@@ -1311,7 +1352,7 @@
     <name>TrackView</name>
     <message>
         <source>Get data from CDDB</source>
-        <translation>מביא נתונים מ CDDB</translation>
+        <translation>אחזור נתונים מ CDDB</translation>
     </message>
     <message>
         <source>Select another CUE file…</source>

flacon-5.0.0.tar.gz/translations/flacon_hu.desktop -> flacon-5.1.0.tar.gz/translations/flacon_hu.desktop Changed

flacon-5.0.0.tar.gz/translations/flacon_hu.ts -> flacon-5.1.0.tar.gz/translations/flacon_hu.ts Changed

@@ -264,25 +264,25 @@
     <message>
         <source>Update</source>
         <extracomment>Preferences tab title </extracomment>
-        <translation type="unfinished"/>
+        <translation>Frissítés</translation>
     </message>
     <message>
         <source>Automatically check for updates</source>
-        <translation type="unfinished"/>
+        <translation>Frissítések automatikus ellenőrzése</translation>
     </message>
     <message>
         <source>Check now</source>
-        <translation type="unfinished"/>
+        <translation>Ellenőrzés most</translation>
     </message>
     <message>
         <source>Last check was %1</source>
         <comment>Information about last update</comment>
-        <translation type="unfinished"/>
+        <translation>%1 volt utoljára ellenőrizve</translation>
     </message>
     <message>
         <source>Never checked</source>
         <comment>Information about last update</comment>
-        <translation type="unfinished"/>
+        <translation>Nem volt még ellenőrizve</translation>
     </message>
     <message>
         <source>Keep original image size</source>
@@ -294,35 +294,35 @@
     </message>
     <message>
         <source>Resampling</source>
-        <translation type="unfinished"/>
+        <translation>Mintavételezés újra</translation>
     </message>
     <message>
         <source>44100 Hz</source>
         <comment>Item in combobox</comment>
-        <translation type="unfinished"/>
+        <translation>44100 Hz</translation>
     </message>
     <message>
         <source>48000 Hz</source>
         <comment>Item in combobox</comment>
-        <translation type="unfinished"/>
+        <translation>48000 Hz</translation>
     </message>
     <message>
         <source>96000 Hz</source>
         <comment>Item in combobox</comment>
-        <translation type="unfinished"/>
+        <translation>96000 Hz</translation>
     </message>
     <message>
         <source>192000 Hz</source>
         <comment>Item in combobox</comment>
-        <translation type="unfinished"/>
+        <translation>192000 Hz</translation>
     </message>
     <message>
         <source>Maximum bit depth:</source>
-        <translation type="unfinished"/>
+        <translation>Maximális bitráta:</translation>
     </message>
     <message>
         <source>Maximum sample rate:</source>
-        <translation type="unfinished"/>
+        <translation>Maximális mintaérték:</translation>
     </message>
     <message>
         <source>Per track CUE sheet</source>
@@ -335,23 +335,49 @@
     <message>
         <source>Same as source</source>
         <comment>Item in combobox</comment>
-        <translation type="unfinished"/>
+        <translation>Azonos a forrással</translation>
     </message>
     <message>
         <source>16-bit</source>
         <comment>Item in combobox</comment>
-        <translation type="unfinished"/>
+        <translation>16-bit</translation>
     </message>
     <message>
         <source>24-bit</source>
         <comment>Item in combobox</comment>
-        <translation type="unfinished"/>
+        <translation>24-bit</translation>
     </message>
     <message>
         <source>32-bit</source>
         <comment>Item in combobox</comment>
+        <translation>32-bit</translation>
+    </message>
+    <message>
+        <source>File name format:</source>
+        <extracomment>Settings dialog, label for the edit control with name of the created CUE file.</extracomment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Insert &quot;Artist&quot;</source>
+        <translation>&quot;Előadó&quot; beszúrása</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Album title&quot;</source>
+        <translation>&quot;Albumcím&quot; beszúrása</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Year&quot;</source>
+        <translation>&quot;Év&quot; beszúrása</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Genre&quot;</source>
+        <translation>&quot;Műfaj&quot; beszúrása</translation>
+    </message>
+    <message>
+        <source>Use &quot;%1&quot;</source>
+        <comment>Predefined CUE file name, string like 'Use &quot;%a/%A/%n - %t.cue&quot;'</comment>
+        <translation>&quot;%1&quot; használata</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -1061,15 +1087,15 @@
     </message>
     <message>
         <source>Add disk…</source>
-        <translation type="unfinished"/>
+        <translation>Lemez hozzáadása...</translation>
     </message>
     <message>
         <source>Select directory…</source>
-        <translation type="unfinished"/>
+        <translation>Könyvtár kiválasztása..</translation>
     </message>
     <message>
         <source>Check for Updates…</source>
-        <translation type="unfinished"/>
+        <translation>Frissítések ellenőrzése...</translation>
     </message>
     <message>
         <source>Edit tags…</source>
@@ -1090,6 +1116,21 @@
         <source>Album performer:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Convert selected</source>
+        <extracomment>Main menu item</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Start conversion process for the selected tracks</source>
+        <extracomment>Main menu item tooltip</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ctrl+Shift+W</source>
+        <extracomment>Main menu item shortcut</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>
@@ -1252,22 +1293,22 @@
     <message>
         <source>Disk number:</source>
         <comment>Music tag name</comment>
-        <translation type="unfinished"/>
+        <translation>Lemez száma:</translation>
     </message>
     <message>
         <source>Track title:</source>
         <comment>Music tag name</comment>
-        <translation type="unfinished"/>
+        <translation>Sáv címe:</translation>
     </message>
     <message>
         <source>Comment:</source>
         <comment>Music tag name</comment>
-        <translation type="unfinished"/>
+        <translation>Megjegyzés:</translation>
     </message>
     <message>
         <source>Start track number:</source>
         <comment>Music tag name</comment>
-        <translation type="unfinished"/>
+        <translation>Kezdősáv száma:</translation>
     </message>
     <message>
         <source>Album performer:</source>

flacon-5.0.0.tar.gz/translations/flacon_id.desktop -> flacon-5.1.0.tar.gz/translations/flacon_id.desktop Changed

flacon-5.0.0.tar.gz/translations/flacon_id.ts -> flacon-5.1.0.tar.gz/translations/flacon_id.ts Changed

@@ -352,6 +352,32 @@
         <comment>Item in combobox</comment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>File name format:</source>
+        <extracomment>Settings dialog, label for the edit control with name of the created CUE file.</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert &quot;Artist&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert &quot;Album title&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert &quot;Year&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert &quot;Genre&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use &quot;%1&quot;</source>
+        <comment>Predefined CUE file name, string like 'Use &quot;%a/%A/%n - %t.cue&quot;'</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -1073,6 +1099,21 @@
         <source>Album performer:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Convert selected</source>
+        <extracomment>Main menu item</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Start conversion process for the selected tracks</source>
+        <extracomment>Main menu item tooltip</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ctrl+Shift+W</source>
+        <extracomment>Main menu item shortcut</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>

flacon-5.0.0.tar.gz/translations/flacon_it.desktop -> flacon-5.1.0.tar.gz/translations/flacon_it.desktop Changed

flacon-5.0.0.tar.gz/translations/flacon_it.ts -> flacon-5.1.0.tar.gz/translations/flacon_it.ts Changed

@@ -352,6 +352,32 @@
         <comment>Item in combobox</comment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>File name format:</source>
+        <extracomment>Settings dialog, label for the edit control with name of the created CUE file.</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert &quot;Artist&quot;</source>
+        <translation>Inserisci &quot;Artista&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Album title&quot;</source>
+        <translation>Inserisci &quot;Titolo dell&apos;album&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Year&quot;</source>
+        <translation>Inserisci &quot;Anno&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Genre&quot;</source>
+        <translation>Inserisci &quot;Genere&quot;</translation>
+    </message>
+    <message>
+        <source>Use &quot;%1&quot;</source>
+        <comment>Predefined CUE file name, string like 'Use &quot;%a/%A/%n - %t.cue&quot;'</comment>
+        <translation>Usa &quot;%1&quot;</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -1111,6 +1137,21 @@
         <source>Album performer:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Convert selected</source>
+        <extracomment>Main menu item</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Start conversion process for the selected tracks</source>
+        <extracomment>Main menu item tooltip</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ctrl+Shift+W</source>
+        <extracomment>Main menu item shortcut</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>

flacon-5.0.0.tar.gz/translations/flacon_ja_JP.desktop -> flacon-5.1.0.tar.gz/translations/flacon_ja_JP.desktop Changed

flacon-5.0.0.tar.gz/translations/flacon_ja_JP.ts -> flacon-5.1.0.tar.gz/translations/flacon_ja_JP.ts Changed

@@ -352,6 +352,32 @@
         <comment>Item in combobox</comment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>File name format:</source>
+        <extracomment>Settings dialog, label for the edit control with name of the created CUE file.</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert &quot;Artist&quot;</source>
+        <translation>&quot;アーティスト&quot;を挿入</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Album title&quot;</source>
+        <translation>&quot;アルバムタイトル&quot;を挿入</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Year&quot;</source>
+        <translation>&quot;年&quot;を挿入</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Genre&quot;</source>
+        <translation>&quot;ジャンル&quot;を挿入</translation>
+    </message>
+    <message>
+        <source>Use &quot;%1&quot;</source>
+        <comment>Predefined CUE file name, string like 'Use &quot;%a/%A/%n - %t.cue&quot;'</comment>
+        <translation> &quot;%1&quot;を使う</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -1069,6 +1095,21 @@
         <source>Album performer:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Convert selected</source>
+        <extracomment>Main menu item</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Start conversion process for the selected tracks</source>
+        <extracomment>Main menu item tooltip</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ctrl+Shift+W</source>
+        <extracomment>Main menu item shortcut</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>

flacon-5.0.0.tar.gz/translations/flacon_lt.desktop -> flacon-5.1.0.tar.gz/translations/flacon_lt.desktop Changed

flacon-5.0.0.tar.gz/translations/flacon_lt.ts -> flacon-5.1.0.tar.gz/translations/flacon_lt.ts Changed

@@ -352,6 +352,32 @@
         <comment>Item in combobox</comment>
         <translation>32-bitų</translation>
     </message>
+    <message>
+        <source>File name format:</source>
+        <extracomment>Settings dialog, label for the edit control with name of the created CUE file.</extracomment>
+        <translation>Failo pavadinimo formatas:</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Artist&quot;</source>
+        <translation>Įterpti &quot;Atlikėją&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Album title&quot;</source>
+        <translation>Įterpti &quot;Albumo pavadinimą&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Year&quot;</source>
+        <translation>Įterpti &quot;Metus&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Genre&quot;</source>
+        <translation>Įterpti &quot;Žanrą&quot;</translation>
+    </message>
+    <message>
+        <source>Use &quot;%1&quot;</source>
+        <comment>Predefined CUE file name, string like 'Use &quot;%a/%A/%n - %t.cue&quot;'</comment>
+        <translation>Naudoti &quot;%1&quot;</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -1122,6 +1148,21 @@
         <source>Album performer:</source>
         <translation>Albumo atlikėjas:</translation>
     </message>
+    <message>
+        <source>Convert selected</source>
+        <extracomment>Main menu item</extracomment>
+        <translation>Konvertavimas pasirinktas</translation>
+    </message>
+    <message>
+        <source>Start conversion process for the selected tracks</source>
+        <extracomment>Main menu item tooltip</extracomment>
+        <translation>Pradėti konvertavimo procesą pasirinktiems takeliams</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+W</source>
+        <extracomment>Main menu item shortcut</extracomment>
+        <translation>Ctrl+Shift+W</translation>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>

flacon-5.0.0.tar.gz/translations/flacon_ms_MY.desktop -> flacon-5.1.0.tar.gz/translations/flacon_ms_MY.desktop Changed

flacon-5.0.0.tar.gz/translations/flacon_ms_MY.ts -> flacon-5.1.0.tar.gz/translations/flacon_ms_MY.ts Changed

@@ -352,6 +352,32 @@
         <comment>Item in combobox</comment>
         <translation>32-bit</translation>
     </message>
+    <message>
+        <source>File name format:</source>
+        <extracomment>Settings dialog, label for the edit control with name of the created CUE file.</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert &quot;Artist&quot;</source>
+        <translation>Sisip &quot;Artis&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Album title&quot;</source>
+        <translation>Sisip &quot;Tajuk album&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Year&quot;</source>
+        <translation>Sisip &quot;Tahun&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Genre&quot;</source>
+        <translation>Sisip &quot;Genre&quot;</translation>
+    </message>
+    <message>
+        <source>Use &quot;%1&quot;</source>
+        <comment>Predefined CUE file name, string like 'Use &quot;%a/%A/%n - %t.cue&quot;'</comment>
+        <translation>Guna &quot;%1&quot;</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -1123,6 +1149,21 @@
         <source>Album performer:</source>
         <translation>Pelaku album:</translation>
     </message>
+    <message>
+        <source>Convert selected</source>
+        <extracomment>Main menu item</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Start conversion process for the selected tracks</source>
+        <extracomment>Main menu item tooltip</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ctrl+Shift+W</source>
+        <extracomment>Main menu item shortcut</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>

flacon-5.0.0.tar.gz/translations/flacon_nb.desktop -> flacon-5.1.0.tar.gz/translations/flacon_nb.desktop Changed

flacon-5.0.0.tar.gz/translations/flacon_nb.ts -> flacon-5.1.0.tar.gz/translations/flacon_nb.ts Changed

@@ -352,6 +352,32 @@
         <comment>Item in combobox</comment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>File name format:</source>
+        <extracomment>Settings dialog, label for the edit control with name of the created CUE file.</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert &quot;Artist&quot;</source>
+        <translation>Sett inn &quot;artist&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Album title&quot;</source>
+        <translation>Sett inn &quot;albumtittel&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Year&quot;</source>
+        <translation>Sett inn &quot;år&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Genre&quot;</source>
+        <translation>Sett in &quot;sjanger&quot;</translation>
+    </message>
+    <message>
+        <source>Use &quot;%1&quot;</source>
+        <comment>Predefined CUE file name, string like 'Use &quot;%a/%A/%n - %t.cue&quot;'</comment>
+        <translation>Bruk &quot;%1&quot;</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -1122,6 +1148,21 @@
         <source>Album performer:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Convert selected</source>
+        <extracomment>Main menu item</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Start conversion process for the selected tracks</source>
+        <extracomment>Main menu item tooltip</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ctrl+Shift+W</source>
+        <extracomment>Main menu item shortcut</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>

flacon-5.0.0.tar.gz/translations/flacon_nl.desktop -> flacon-5.1.0.tar.gz/translations/flacon_nl.desktop Changed

flacon-5.0.0.tar.gz/translations/flacon_nl.ts -> flacon-5.1.0.tar.gz/translations/flacon_nl.ts Changed

@@ -294,64 +294,90 @@
     </message>
     <message>
         <source>Resampling</source>
-        <translation type="unfinished"/>
+        <translation>Resamplen</translation>
     </message>
     <message>
         <source>44100 Hz</source>
         <comment>Item in combobox</comment>
-        <translation type="unfinished"/>
+        <translation>44100 Hz</translation>
     </message>
     <message>
         <source>48000 Hz</source>
         <comment>Item in combobox</comment>
-        <translation type="unfinished"/>
+        <translation>48000 Hz</translation>
     </message>
     <message>
         <source>96000 Hz</source>
         <comment>Item in combobox</comment>
-        <translation type="unfinished"/>
+        <translation>96000 Hz</translation>
     </message>
     <message>
         <source>192000 Hz</source>
         <comment>Item in combobox</comment>
-        <translation type="unfinished"/>
+        <translation>192000 Hz</translation>
     </message>
     <message>
         <source>Maximum bit depth:</source>
-        <translation type="unfinished"/>
+        <translation>Maximale bitdiepte:</translation>
     </message>
     <message>
         <source>Maximum sample rate:</source>
-        <translation type="unfinished"/>
+        <translation>Maximale samplesnelheid:</translation>
     </message>
     <message>
         <source>Per track CUE sheet</source>
-        <translation type="unfinished"/>
+        <translation>Cueblad per nummer</translation>
     </message>
     <message>
         <source>Create per track CUE sheet</source>
-        <translation type="unfinished"/>
+        <translation>Cueblad aanmaken per nummer</translation>
     </message>
     <message>
         <source>Same as source</source>
         <comment>Item in combobox</comment>
-        <translation type="unfinished"/>
+        <translation>Gelijk aan bron</translation>
     </message>
     <message>
         <source>16-bit</source>
         <comment>Item in combobox</comment>
-        <translation type="unfinished"/>
+        <translation>16-bit</translation>
     </message>
     <message>
         <source>24-bit</source>
         <comment>Item in combobox</comment>
-        <translation type="unfinished"/>
+        <translation>24-bit</translation>
     </message>
     <message>
         <source>32-bit</source>
         <comment>Item in combobox</comment>
+        <translation>32-bit</translation>
+    </message>
+    <message>
+        <source>File name format:</source>
+        <extracomment>Settings dialog, label for the edit control with name of the created CUE file.</extracomment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Insert &quot;Artist&quot;</source>
+        <translation>‘Artiest’ invoegen</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Album title&quot;</source>
+        <translation>‘Albumtitel’ invoegen</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Year&quot;</source>
+        <translation>‘Jaar’ invoegen</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Genre&quot;</source>
+        <translation>‘Genre’ invoegen</translation>
+    </message>
+    <message>
+        <source>Use &quot;%1&quot;</source>
+        <comment>Predefined CUE file name, string like 'Use &quot;%a/%A/%n - %t.cue&quot;'</comment>
+        <translation>Gebruik ‘%1’</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -690,7 +716,7 @@
     </message>
     <message>
         <source>Audio file shorter than expected from CUE sheet.</source>
-        <translation type="unfinished"/>
+        <translation>Audiobestand korter dan verwacht van cuebestand.</translation>
     </message>
     <message>
         <source>A maximum of %1-bit per sample is supported by this format. This value will be used for encoding.</source>
@@ -1055,21 +1081,21 @@
     <message>
         <source>Standard music location</source>
         <comment>Menu item for output direcory button</comment>
-        <translation type="unfinished"/>
+        <translation>Standaardlocatie voor muziek</translation>
     </message>
     <message>
         <source>Desktop</source>
         <comment>Menu item for output direcory button</comment>
-        <translation type="unfinished"/>
+        <translation>Bureaublad</translation>
     </message>
     <message>
         <source>Same directory as CUE file</source>
         <comment>Menu item for output direcory button</comment>
-        <translation type="unfinished"/>
+        <translation>Zelfde map als cuebestand</translation>
     </message>
     <message>
         <source>Remove current directory from history</source>
-        <translation type="unfinished"/>
+        <translation>Huidige map uit geschiedenis verwijderen</translation>
     </message>
     <message>
         <source>Get data from CDDB</source>
@@ -1079,7 +1105,7 @@
     <message>
         <source>Select CUE file</source>
         <comment>OpenFile dialog title</comment>
-        <translation type="unfinished"/>
+        <translation>Kies cuebestand</translation>
     </message>
     <message>
         <source>Add CUE or audio file</source>
@@ -1089,39 +1115,54 @@
     <message>
         <source>Edit all tags…</source>
         <comment>Button text</comment>
-        <translation type="unfinished"/>
+        <translation>Alle tags bewerken…</translation>
     </message>
     <message>
         <source>Add disk…</source>
-        <translation type="unfinished"/>
+        <translation>Schijf toevoegen…</translation>
     </message>
     <message>
         <source>Select directory…</source>
-        <translation type="unfinished"/>
+        <translation>Kies map…</translation>
     </message>
     <message>
         <source>Check for Updates…</source>
-        <translation type="unfinished"/>
+        <translation>Controleren op updates…</translation>
     </message>
     <message>
         <source>Edit tags…</source>
         <comment>context menu</comment>
-        <translation type="unfinished"/>
+        <translation>Tags bewerken…</translation>
     </message>
     <message>
         <source>Select another audio file…</source>
         <comment>context menu</comment>
-        <translation type="unfinished"/>
+        <translation>Kies een ander audiobestand…</translation>
     </message>
     <message>
         <source>Select another CUE file…</source>
         <comment>context menu</comment>
-        <translation type="unfinished"/>
+        <translation>Kies een ander cuebestand…</translation>
     </message>
     <message>
         <source>Album performer:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Convert selected</source>
+        <extracomment>Main menu item</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Start conversion process for the selected tracks</source>
+        <extracomment>Main menu item tooltip</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ctrl+Shift+W</source>
+        <extracomment>Main menu item shortcut</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>
@@ -1216,30 +1257,30 @@
     </message>
     <message>
         <source>I can&apos;t write CUE file &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
-        <translation type="unfinished"/>
+        <translation>Ik kan niet naar het cuebestand &lt;b&gt;%1&lt;/b&gt; schrijven:&lt;br&gt;%2</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; is not a valid CUE file. Incorrect track number on line %2.</source>
         <comment>Cue parser error.</comment>
-        <translation type="unfinished"/>
+        <translation>&lt;b&gt;%1&lt;/b&gt; is geen geldig cuebestand. Verkeerd tracknummer op regel %2.</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; is not a valid CUE file. Incorrect track index on line %2.</source>
         <comment>Cue parser error.</comment>
-        <translation type="unfinished"/>
+        <translation>&lt;b&gt;%1&lt;/b&gt; is geen geldig cuebestand. Verkeerde trackindex op regel %2.</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; is not a valid CUE file. The CUE sheet has no FILE tag.</source>
-        <translation type="unfinished"/>
+        <translation>&lt;b&gt;%1&lt;/b&gt; is geen geldig cuebestand. Het cueblad heeft geen FILE-tag.</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; is not a valid CUE file. Disk %2 has no tags.</source>
-        <translation type="unfinished"/>
+        <translation>&lt;b&gt;%1&lt;/b&gt; is geen geldig cuebestand. Schijf %2 heeft geen tags.</translation>
     </message>
     <message>
         <source>I can&apos;t save cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
         <comment>%1 - is file name, %2 - an error text</comment>
-        <translation type="unfinished"/>
+        <translation>Ik kan het albumhoesbestand &lt;b&gt;%1&lt;/b&gt; niet opslaan:&lt;br&gt;%2</translation>
     </message>
 </context>
 <context>
@@ -1255,11 +1296,11 @@
     <message>
         <source>Edit tags</source>
         <comment>Dialog title</comment>
-        <translation type="unfinished"/>
+        <translation>Tags bewerken</translation>
     </message>
     <message>
         <source>of</source>
-        <translation type="unfinished"/>
+        <translation>van</translation>
     </message>
     <message>
         <source>Artist:</source>
@@ -1284,17 +1325,17 @@
     <message>
         <source>Disk number:</source>
         <comment>Music tag name</comment>
-        <translation type="unfinished"/>
+        <translation>Schijfnummer:</translation>
     </message>
     <message>
         <source>Track title:</source>
         <comment>Music tag name</comment>
-        <translation type="unfinished"/>
+        <translation>Nummertitel:</translation>
     </message>
     <message>
         <source>Comment:</source>
         <comment>Music tag name</comment>
-        <translation type="unfinished"/>
+        <translation>Opmerking:</translation>
     </message>
     <message>
         <source>Start track number:</source>
@@ -1315,7 +1356,7 @@
     </message>
     <message>
         <source>Select another CUE file…</source>
-        <translation type="unfinished"/>
+        <translation>Kies een ander cuebestand…</translation>
     </message>
 </context>
 <context>

flacon-5.0.0.tar.gz/translations/flacon_nl_BE.desktop -> flacon-5.1.0.tar.gz/translations/flacon_nl_BE.desktop Changed

flacon-5.0.0.tar.gz/translations/flacon_nl_BE.ts -> flacon-5.1.0.tar.gz/translations/flacon_nl_BE.ts Changed

@@ -352,6 +352,32 @@
         <comment>Item in combobox</comment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>File name format:</source>
+        <extracomment>Settings dialog, label for the edit control with name of the created CUE file.</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert &quot;Artist&quot;</source>
+        <translation>‘Artiest’ invoegen</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Album title&quot;</source>
+        <translation>‘Albumtitel’ invoegen</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Year&quot;</source>
+        <translation>‘Jaar’ invoegen</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Genre&quot;</source>
+        <translation>‘Genre’ invoegen</translation>
+    </message>
+    <message>
+        <source>Use &quot;%1&quot;</source>
+        <comment>Predefined CUE file name, string like 'Use &quot;%a/%A/%n - %t.cue&quot;'</comment>
+        <translation>Gebruik ‘%1’</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -1122,6 +1148,21 @@
         <source>Album performer:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Convert selected</source>
+        <extracomment>Main menu item</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Start conversion process for the selected tracks</source>
+        <extracomment>Main menu item tooltip</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ctrl+Shift+W</source>
+        <extracomment>Main menu item shortcut</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>

flacon-5.0.0.tar.gz/translations/flacon_pl.desktop -> flacon-5.1.0.tar.gz/translations/flacon_pl.desktop Changed

flacon-5.0.0.tar.gz/translations/flacon_pl.ts -> flacon-5.1.0.tar.gz/translations/flacon_pl.ts Changed

@@ -352,6 +352,32 @@
         <comment>Item in combobox</comment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>File name format:</source>
+        <extracomment>Settings dialog, label for the edit control with name of the created CUE file.</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert &quot;Artist&quot;</source>
+        <translation>Wstaw &quot;Wykonawca&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Album title&quot;</source>
+        <translation>Wstaw &quot;Tytuł albumu&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Year&quot;</source>
+        <translation>Wstaw &quot;Rok&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Genre&quot;</source>
+        <translation>Wstaw &quot;Gatunek&quot;</translation>
+    </message>
+    <message>
+        <source>Use &quot;%1&quot;</source>
+        <comment>Predefined CUE file name, string like 'Use &quot;%a/%A/%n - %t.cue&quot;'</comment>
+        <translation>Użyj &quot;%1&quot;</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -1110,6 +1136,21 @@
         <source>Album performer:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Convert selected</source>
+        <extracomment>Main menu item</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Start conversion process for the selected tracks</source>
+        <extracomment>Main menu item tooltip</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ctrl+Shift+W</source>
+        <extracomment>Main menu item shortcut</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>

flacon-5.0.0.tar.gz/translations/flacon_pl_PL.desktop -> flacon-5.1.0.tar.gz/translations/flacon_pl_PL.desktop Changed

flacon-5.0.0.tar.gz/translations/flacon_pl_PL.ts -> flacon-5.1.0.tar.gz/translations/flacon_pl_PL.ts Changed

@@ -352,6 +352,32 @@
         <comment>Item in combobox</comment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>File name format:</source>
+        <extracomment>Settings dialog, label for the edit control with name of the created CUE file.</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert &quot;Artist&quot;</source>
+        <translation>Wstaw &quot;Wykonawca&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Album title&quot;</source>
+        <translation>Wstaw &quot;Tytuł albumu&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Year&quot;</source>
+        <translation>Wstaw &quot;Rok&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Genre&quot;</source>
+        <translation>Wstaw &quot;Gatunek&quot;</translation>
+    </message>
+    <message>
+        <source>Use &quot;%1&quot;</source>
+        <comment>Predefined CUE file name, string like 'Use &quot;%a/%A/%n - %t.cue&quot;'</comment>
+        <translation>Użyj &quot;%1&quot;</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -1098,6 +1124,21 @@
         <source>Album performer:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Convert selected</source>
+        <extracomment>Main menu item</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Start conversion process for the selected tracks</source>
+        <extracomment>Main menu item tooltip</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ctrl+Shift+W</source>
+        <extracomment>Main menu item shortcut</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>

flacon-5.0.0.tar.gz/translations/flacon_pt_BR.desktop -> flacon-5.1.0.tar.gz/translations/flacon_pt_BR.desktop Changed

flacon-5.0.0.tar.gz/translations/flacon_pt_BR.ts -> flacon-5.1.0.tar.gz/translations/flacon_pt_BR.ts Changed

@@ -352,6 +352,32 @@
         <comment>Item in combobox</comment>
         <translation>32-bit</translation>
     </message>
+    <message>
+        <source>File name format:</source>
+        <extracomment>Settings dialog, label for the edit control with name of the created CUE file.</extracomment>
+        <translation>Formato do nome do arquivo:</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Artist&quot;</source>
+        <translation>Insira o &quot;Artista&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Album title&quot;</source>
+        <translation>Insira o &quot;Título do álbum&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Year&quot;</source>
+        <translation>Insira o &quot;Ano&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Genre&quot;</source>
+        <translation>Insira o &quot;Gênero&quot;</translation>
+    </message>
+    <message>
+        <source>Use &quot;%1&quot;</source>
+        <comment>Predefined CUE file name, string like 'Use &quot;%a/%A/%n - %t.cue&quot;'</comment>
+        <translation>Usar &quot;%1&quot;</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -1118,6 +1144,21 @@
         <source>Album performer:</source>
         <translation>Intérprete do disco:</translation>
     </message>
+    <message>
+        <source>Convert selected</source>
+        <extracomment>Main menu item</extracomment>
+        <translation>Converter selecionadas</translation>
+    </message>
+    <message>
+        <source>Start conversion process for the selected tracks</source>
+        <extracomment>Main menu item tooltip</extracomment>
+        <translation>Iniciar o processo de conversão das faixas selecionadas</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+W</source>
+        <extracomment>Main menu item shortcut</extracomment>
+        <translation>Ctrl+Shift+W</translation>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>

flacon-5.0.0.tar.gz/translations/flacon_pt_PT.desktop -> flacon-5.1.0.tar.gz/translations/flacon_pt_PT.desktop Changed

flacon-5.0.0.tar.gz/translations/flacon_pt_PT.ts -> flacon-5.1.0.tar.gz/translations/flacon_pt_PT.ts Changed

@@ -352,6 +352,32 @@
         <comment>Item in combobox</comment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>File name format:</source>
+        <extracomment>Settings dialog, label for the edit control with name of the created CUE file.</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert &quot;Artist&quot;</source>
+        <translation>Inserir &quot;Artista&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Album title&quot;</source>
+        <translation>Inserir &quot;Título do álbum&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Year&quot;</source>
+        <translation>Inserir &quot;Ano&quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Genre&quot;</source>
+        <translation>Inserir &quot;Género&quot;</translation>
+    </message>
+    <message>
+        <source>Use &quot;%1&quot;</source>
+        <comment>Predefined CUE file name, string like 'Use &quot;%a/%A/%n - %t.cue&quot;'</comment>
+        <translation>Use &quot;%1&quot;</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -1093,6 +1119,21 @@
         <source>Album performer:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Convert selected</source>
+        <extracomment>Main menu item</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Start conversion process for the selected tracks</source>
+        <extracomment>Main menu item tooltip</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ctrl+Shift+W</source>
+        <extracomment>Main menu item shortcut</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>

flacon-5.0.0.tar.gz/translations/flacon_ro_RO.desktop -> flacon-5.1.0.tar.gz/translations/flacon_ro_RO.desktop Changed

flacon-5.0.0.tar.gz/translations/flacon_ro_RO.ts -> flacon-5.1.0.tar.gz/translations/flacon_ro_RO.ts Changed

@@ -352,6 +352,32 @@
         <comment>Item in combobox</comment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>File name format:</source>
+        <extracomment>Settings dialog, label for the edit control with name of the created CUE file.</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert &quot;Artist&quot;</source>
+        <translation>Introduceți „Artist”</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Album title&quot;</source>
+        <translation>Introduceți „Titlu album”</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Year&quot;</source>
+        <translation>Introduceți „Anul”</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Genre&quot;</source>
+        <translation>Introduceți „Genul”</translation>
+    </message>
+    <message>
+        <source>Use &quot;%1&quot;</source>
+        <comment>Predefined CUE file name, string like 'Use &quot;%a/%A/%n - %t.cue&quot;'</comment>
+        <translation>Utilizează &quot;%1&quot;</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -1122,6 +1148,21 @@
         <source>Album performer:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Convert selected</source>
+        <extracomment>Main menu item</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Start conversion process for the selected tracks</source>
+        <extracomment>Main menu item tooltip</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ctrl+Shift+W</source>
+        <extracomment>Main menu item shortcut</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>

flacon-5.0.0.tar.gz/translations/flacon_ru.desktop -> flacon-5.1.0.tar.gz/translations/flacon_ru.desktop Changed

flacon-5.0.0.tar.gz/translations/flacon_ru.ts -> flacon-5.1.0.tar.gz/translations/flacon_ru.ts Changed

@@ -72,7 +72,7 @@
     </message>
     <message>
         <source>Flacon is translated into many languages thanks to the work of the Flacon translation teams on &lt;a href=&apos;%1&apos;&gt;Transifex&lt;/a&gt;.</source>
-        <translation>Flacon переведена на множество языков благодаря работе команды переводчиков на сайте &lt;a href=&apos;%1&apos;&gt;Transifex&lt;/a&gt;..</translation>
+        <translation>Flacon переведена на множество языков благодаря работе команды переводчиков на сайте &lt;a href=&apos;%1&apos;&gt;Transifex&lt;/a&gt;.</translation>
     </message>
 </context>
 <context>
@@ -352,6 +352,32 @@
         <comment>Item in combobox</comment>
         <translation>32 бит</translation>
     </message>
+    <message>
+        <source>File name format:</source>
+        <extracomment>Settings dialog, label for the edit control with name of the created CUE file.</extracomment>
+        <translation>Имя файла:</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Artist&quot;</source>
+        <translation>Вставить имя артиста</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Album title&quot;</source>
+        <translation>Вставить название альбома</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Year&quot;</source>
+        <translation>Вставить год</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Genre&quot;</source>
+        <translation>Вставить жанр</translation>
+    </message>
+    <message>
+        <source>Use &quot;%1&quot;</source>
+        <comment>Predefined CUE file name, string like 'Use &quot;%a/%A/%n - %t.cue&quot;'</comment>
+        <translation>Использовать &quot;%1&quot;</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -1119,6 +1145,21 @@
         <source>Album performer:</source>
         <translation>Исполнитель альбома:</translation>
     </message>
+    <message>
+        <source>Convert selected</source>
+        <extracomment>Main menu item</extracomment>
+        <translation>Конвертировать выделенное</translation>
+    </message>
+    <message>
+        <source>Start conversion process for the selected tracks</source>
+        <extracomment>Main menu item tooltip</extracomment>
+        <translation>Конвертировать выделенные треки</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+W</source>
+        <extracomment>Main menu item shortcut</extracomment>
+        <translation>Ctrl+Shift+W</translation>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>

flacon-5.0.0.tar.gz/translations/flacon_sr.desktop -> flacon-5.1.0.tar.gz/translations/flacon_sr.desktop Changed

flacon-5.0.0.tar.gz/translations/flacon_sr.ts -> flacon-5.1.0.tar.gz/translations/flacon_sr.ts Changed

@@ -352,6 +352,32 @@
         <comment>Item in combobox</comment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>File name format:</source>
+        <extracomment>Settings dialog, label for the edit control with name of the created CUE file.</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert &quot;Artist&quot;</source>
+        <translation>Убаци „Извођач“</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Album title&quot;</source>
+        <translation>Убаци „Наслов албума“</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Year&quot;</source>
+        <translation>Убаци „Година“</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Genre&quot;</source>
+        <translation>Убци „Жанр“</translation>
+    </message>
+    <message>
+        <source>Use &quot;%1&quot;</source>
+        <comment>Predefined CUE file name, string like 'Use &quot;%a/%A/%n - %t.cue&quot;'</comment>
+        <translation>Користи „%1“</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -1070,6 +1096,21 @@
         <source>Album performer:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Convert selected</source>
+        <extracomment>Main menu item</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Start conversion process for the selected tracks</source>
+        <extracomment>Main menu item tooltip</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ctrl+Shift+W</source>
+        <extracomment>Main menu item shortcut</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>

flacon-5.0.0.tar.gz/translations/flacon_sr@latin.desktop -> flacon-5.1.0.tar.gz/translations/flacon_sr@latin.desktop Changed

flacon-5.0.0.tar.gz/translations/flacon_sr@latin.ts -> flacon-5.1.0.tar.gz/translations/flacon_sr@latin.ts Changed

@@ -352,6 +352,32 @@
         <comment>Item in combobox</comment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>File name format:</source>
+        <extracomment>Settings dialog, label for the edit control with name of the created CUE file.</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert &quot;Artist&quot;</source>
+        <translation>Ubaci „Izvođač“</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Album title&quot;</source>
+        <translation>Ubaci „Naslov albuma“</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Year&quot;</source>
+        <translation>Ubaci „Godina“</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Genre&quot;</source>
+        <translation>Ubci „Žanr“</translation>
+    </message>
+    <message>
+        <source>Use &quot;%1&quot;</source>
+        <comment>Predefined CUE file name, string like 'Use &quot;%a/%A/%n - %t.cue&quot;'</comment>
+        <translation>Koristi „%1“</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -1070,6 +1096,21 @@
         <source>Album performer:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Convert selected</source>
+        <extracomment>Main menu item</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Start conversion process for the selected tracks</source>
+        <extracomment>Main menu item tooltip</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ctrl+Shift+W</source>
+        <extracomment>Main menu item shortcut</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>

flacon-5.0.0.tar.gz/translations/flacon_tr.desktop -> flacon-5.1.0.tar.gz/translations/flacon_tr.desktop Changed

flacon-5.0.0.tar.gz/translations/flacon_tr.ts -> flacon-5.1.0.tar.gz/translations/flacon_tr.ts Changed

@@ -352,6 +352,32 @@
         <comment>Item in combobox</comment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>File name format:</source>
+        <extracomment>Settings dialog, label for the edit control with name of the created CUE file.</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert &quot;Artist&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert &quot;Album title&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert &quot;Year&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert &quot;Genre&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use &quot;%1&quot;</source>
+        <comment>Predefined CUE file name, string like 'Use &quot;%a/%A/%n - %t.cue&quot;'</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -1063,6 +1089,21 @@
         <source>Album performer:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Convert selected</source>
+        <extracomment>Main menu item</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Start conversion process for the selected tracks</source>
+        <extracomment>Main menu item tooltip</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ctrl+Shift+W</source>
+        <extracomment>Main menu item shortcut</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>

flacon-5.0.0.tar.gz/translations/flacon_uk.desktop -> flacon-5.1.0.tar.gz/translations/flacon_uk.desktop Changed

flacon-5.0.0.tar.gz/translations/flacon_uk.ts -> flacon-5.1.0.tar.gz/translations/flacon_uk.ts Changed

@@ -7,7 +7,7 @@
     </message>
     <message>
         <source>About</source>
-        <translation>Про проґраму</translation>
+        <translation>Про програму</translation>
     </message>
     <message>
         <source>Author</source>
@@ -23,7 +23,7 @@
     </message>
     <message>
         <source>External programs</source>
-        <translation>Зовнішні проґрами</translation>
+        <translation>Зовнішні програми</translation>
     </message>
     <message>
         <source>Homepage: %1</source>
@@ -39,11 +39,11 @@
     </message>
     <message>
         <source>Flacon uses external programs. Many thanks to their authors!</source>
-        <translation>Flacon використовує зовнішні проґрами. Велике дякую їх авторам!</translation>
+        <translation>Flacon використовує зовнішні програми. Велика подяка їх авторам!</translation>
     </message>
     <message>
         <source>Extracts individual tracks from one big audio file containing the entire album.</source>
-        <translation>Видобуває окремі доріжки з одного великого аудіофайлу, який містить увесь альбом повністю.</translation>
+        <translation>Видобуває окремі доріжки з одного великого аудіофайлу, що містить увесь альбом повністю.</translation>
     </message>
     <message>
         <source>Copyright: %1-%2 %3</source>
@@ -219,7 +219,7 @@
     </message>
     <message>
         <source>Full path of the external applications</source>
-        <translation>Повний шлях до зовнішніх проґрам</translation>
+        <translation>Повний шлях до зовнішніх програм</translation>
     </message>
     <message>
         <source>Extract to separate file</source>
@@ -235,7 +235,7 @@
     </message>
     <message>
         <source>Programs</source>
-        <translation>Проґрами</translation>
+        <translation>Програми</translation>
     </message>
     <message>
         <source>Select temporary directory</source>
@@ -243,7 +243,7 @@
     </message>
     <message>
         <source> px</source>
-        <translation> px</translation>
+        <translation> пікс.</translation>
     </message>
     <message>
         <source>Temporary directory:</source>
@@ -277,44 +277,44 @@
     <message>
         <source>Last check was %1</source>
         <comment>Information about last update</comment>
-        <translation>Останнє оновлення було %1</translation>
+        <translation>Востаннє перевірялось %1</translation>
     </message>
     <message>
         <source>Never checked</source>
         <comment>Information about last update</comment>
-        <translation>Ніколи не перевіряли</translation>
+        <translation>Ніколи не перевірялось</translation>
     </message>
     <message>
         <source>Keep original image size</source>
-        <translation>В початковому розмірі</translation>
+        <translation>Зберігати початковий розмір зображення</translation>
     </message>
     <message>
         <source>Resize if image size greater than</source>
-        <translation>Масштабувати якщо картинка більша ніж</translation>
+        <translation>Масштабувати, якщо картинка більша ніж</translation>
     </message>
     <message>
         <source>Resampling</source>
-        <translation type="unfinished"/>
+        <translation>Передискретизація</translation>
     </message>
     <message>
         <source>44100 Hz</source>
         <comment>Item in combobox</comment>
-        <translation type="unfinished"/>
+        <translation>44100 Гц</translation>
     </message>
     <message>
         <source>48000 Hz</source>
         <comment>Item in combobox</comment>
-        <translation type="unfinished"/>
+        <translation>48000 Гц</translation>
     </message>
     <message>
         <source>96000 Hz</source>
         <comment>Item in combobox</comment>
-        <translation type="unfinished"/>
+        <translation>96000 Гц</translation>
     </message>
     <message>
         <source>192000 Hz</source>
         <comment>Item in combobox</comment>
-        <translation type="unfinished"/>
+        <translation>192000 Гц</translation>
     </message>
     <message>
         <source>Maximum bit depth:</source>
@@ -340,18 +340,44 @@
     <message>
         <source>16-bit</source>
         <comment>Item in combobox</comment>
-        <translation type="unfinished"/>
+        <translation>16 біт</translation>
     </message>
     <message>
         <source>24-bit</source>
         <comment>Item in combobox</comment>
-        <translation type="unfinished"/>
+        <translation>24 біти</translation>
     </message>
     <message>
         <source>32-bit</source>
         <comment>Item in combobox</comment>
+        <translation>32 біти</translation>
+    </message>
+    <message>
+        <source>File name format:</source>
+        <extracomment>Settings dialog, label for the edit control with name of the created CUE file.</extracomment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Insert &quot;Artist&quot;</source>
+        <translation>Вставити ім’я виконавця</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Album title&quot;</source>
+        <translation>Вставити назву альбому</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Year&quot;</source>
+        <translation>Вставити рік</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Genre&quot;</source>
+        <translation>Вставити жанр</translation>
+    </message>
+    <message>
+        <source>Use &quot;%1&quot;</source>
+        <comment>Predefined CUE file name, string like 'Use &quot;%a/%A/%n - %t.cue&quot;'</comment>
+        <translation>Використовувати &quot;%1&quot;</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -796,7 +822,7 @@
     </message>
     <message>
         <source>Pattern:</source>
-        <translation>Шабльон:</translation>
+        <translation>Шаблон:</translation>
     </message>
     <message>
         <source>Format:</source>
@@ -889,7 +915,7 @@
     </message>
     <message>
         <source>Program preferences</source>
-        <translation>Налаштування проґрами</translation>
+        <translation>Налаштування програми</translation>
     </message>
     <message>
         <source>Ctrl+Del</source>
@@ -1034,7 +1060,7 @@
     </message>
     <message>
         <source>Delete current pattern from history</source>
-        <translation>Вилучити поточний шабльон з історії.</translation>
+        <translation>Вилучити поточний шаблон з історії.</translation>
     </message>
     <message>
         <source>Remove disk</source>
@@ -1042,7 +1068,7 @@
     </message>
     <message>
         <source>Remove disk from project</source>
-        <translation>Вилучити диск із проєкту</translation>
+        <translation>Вилучити диск із проекту</translation>
     </message>
     <message>
         <source>Preferences</source>
@@ -1122,6 +1148,21 @@
         <source>Album performer:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Convert selected</source>
+        <extracomment>Main menu item</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Start conversion process for the selected tracks</source>
+        <extracomment>Main menu item tooltip</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ctrl+Shift+W</source>
+        <extracomment>Main menu item shortcut</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>
@@ -1148,7 +1189,7 @@
     <name>ProgramEdit</name>
     <message>
         <source>Select program file</source>
-        <translation>Вкажіть файл проґрами</translation>
+        <translation>Вкажіть файл програми</translation>
     </message>
     <message>
         <source>All files</source>
@@ -1165,11 +1206,11 @@
     <name>QObject</name>
     <message>
         <source>I can&apos;t find program &lt;b&gt;%1&lt;/b&gt;.</source>
-        <translation>Не можу знайти проґраму &lt;b&gt;%1&lt;/b&gt;.</translation>
+        <translation>Не можу знайти програму &lt;b&gt;%1&lt;/b&gt;.</translation>
     </message>
     <message>
         <source>File &lt;b&gt;%1&lt;/b&gt; is not a supported audio file. &lt;br&gt;&lt;br&gt;Verify that all required programs are installed and in your preferences.</source>
-        <translation>Формат аудіо файлу &lt;b&gt;%1&lt;/b&gt; не підтримується. &lt;br&gt;&lt;br&gt;Перевірте що встановлені усі потрібні проґрами й вони вказані у налаштуваннях.</translation>
+        <translation>Формат аудіо файлу &lt;b&gt;%1&lt;/b&gt; не підтримується. &lt;br&gt;&lt;br&gt;Перевірте що встановлені усі потрібні програми й вони вказані у налаштуваннях.</translation>
     </message>
     <message>
         <source>Flacon</source>

flacon-5.0.0.tar.gz/translations/flacon_uz@Latn.desktop -> flacon-5.1.0.tar.gz/translations/flacon_uz@Latn.desktop Changed

flacon-5.0.0.tar.gz/translations/flacon_zh_CN.desktop -> flacon-5.1.0.tar.gz/translations/flacon_zh_CN.desktop Changed

flacon-5.0.0.tar.gz/translations/flacon_zh_CN.ts -> flacon-5.1.0.tar.gz/translations/flacon_zh_CN.ts Changed

@@ -352,6 +352,32 @@
         <comment>Item in combobox</comment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>File name format:</source>
+        <extracomment>Settings dialog, label for the edit control with name of the created CUE file.</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert &quot;Artist&quot;</source>
+        <translation>插入“艺术家 ”</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Album title&quot;</source>
+        <translation>插入“专辑名”</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Year&quot;</source>
+        <translation>插入“发行年”</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Genre&quot;</source>
+        <translation>插入“风格”</translation>
+    </message>
+    <message>
+        <source>Use &quot;%1&quot;</source>
+        <comment>Predefined CUE file name, string like 'Use &quot;%a/%A/%n - %t.cue&quot;'</comment>
+        <translation>使用“%1”</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -1098,6 +1124,21 @@
         <source>Album performer:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Convert selected</source>
+        <extracomment>Main menu item</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Start conversion process for the selected tracks</source>
+        <extracomment>Main menu item tooltip</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ctrl+Shift+W</source>
+        <extracomment>Main menu item shortcut</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>

flacon-5.0.0.tar.gz/translations/flacon_zh_TW.ts -> flacon-5.1.0.tar.gz/translations/flacon_zh_TW.ts Changed

@@ -352,6 +352,32 @@
         <comment>Item in combobox</comment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>File name format:</source>
+        <extracomment>Settings dialog, label for the edit control with name of the created CUE file.</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert &quot;Artist&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert &quot;Album title&quot;</source>
+        <translation>插入 &quot; 專輯名 &quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Year&quot;</source>
+        <translation>插入 ;&quot; 年代 &quot;</translation>
+    </message>
+    <message>
+        <source>Insert &quot;Genre&quot;</source>
+        <translation>插入 &quot;風格&quot;</translation>
+    </message>
+    <message>
+        <source>Use &quot;%1&quot;</source>
+        <comment>Predefined CUE file name, string like 'Use &quot;%a/%A/%n - %t.cue&quot;'</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -1067,6 +1093,21 @@
         <source>Album performer:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Convert selected</source>
+        <extracomment>Main menu item</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Start conversion process for the selected tracks</source>
+        <extracomment>Main menu item tooltip</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ctrl+Shift+W</source>
+        <extracomment>Main menu item shortcut</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>

flacon-5.0.0.tar.gz/translations/src.flacon.ts -> flacon-5.1.0.tar.gz/translations/src.flacon.ts Changed

@@ -354,6 +354,32 @@
         <comment>Item in combobox</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>File name format:</source>
+        <extracomment>Settings dialog, label for the edit control with name of the created CUE file.</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insert &quot;Artist&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insert &quot;Album title&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insert &quot;Year&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insert &quot;Genre&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use &quot;%1&quot;</source>
+        <comment>Predefined CUE file name, string like &apos;Use &quot;%a/%A/%n - %t.cue&quot;&apos;</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -1065,6 +1091,21 @@
         <source>Album performer:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Convert selected</source>
+        <extracomment>Main menu item</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start conversion process for the selected tracks</source>
+        <extracomment>Main menu item tooltip</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+W</source>
+        <extracomment>Main menu item shortcut</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>

flacon-5.0.0.tar.gz/translations/src.translators.info -> flacon-5.1.0.tar.gz/translations/src.translators.info Changed

flacon-5.0.0.tar.gz/translations/translators_cs.info -> flacon-5.1.0.tar.gz/translations/translators_cs.info Changed

flacon-5.0.0.tar.gz/translations/translators_cs_CZ.info -> flacon-5.1.0.tar.gz/translations/translators_cs_CZ.info Changed

flacon-5.0.0.tar.gz/translations/translators_de.info -> flacon-5.1.0.tar.gz/translations/translators_de.info Changed

flacon-5.0.0.tar.gz/translations/translators_el.info -> flacon-5.1.0.tar.gz/translations/translators_el.info Changed

flacon-5.0.0.tar.gz/translations/translators_es.info -> flacon-5.1.0.tar.gz/translations/translators_es.info Changed

flacon-5.0.0.tar.gz/translations/translators_es_MX.info -> flacon-5.1.0.tar.gz/translations/translators_es_MX.info Changed

flacon-5.0.0.tar.gz/translations/translators_fr.info -> flacon-5.1.0.tar.gz/translations/translators_fr.info Changed

flacon-5.0.0.tar.gz/translations/translators_gl.info -> flacon-5.1.0.tar.gz/translations/translators_gl.info Changed

flacon-5.0.0.tar.gz/translations/translators_he.info -> flacon-5.1.0.tar.gz/translations/translators_he.info Changed

flacon-5.0.0.tar.gz/translations/translators_hu.info -> flacon-5.1.0.tar.gz/translations/translators_hu.info Changed

flacon-5.0.0.tar.gz/translations/translators_id.info -> flacon-5.1.0.tar.gz/translations/translators_id.info Changed

flacon-5.0.0.tar.gz/translations/translators_it.info -> flacon-5.1.0.tar.gz/translations/translators_it.info Changed

flacon-5.0.0.tar.gz/translations/translators_ja_JP.info -> flacon-5.1.0.tar.gz/translations/translators_ja_JP.info Changed

flacon-5.0.0.tar.gz/translations/translators_lt.info -> flacon-5.1.0.tar.gz/translations/translators_lt.info Changed

flacon-5.0.0.tar.gz/translations/translators_ms_MY.info -> flacon-5.1.0.tar.gz/translations/translators_ms_MY.info Changed

flacon-5.0.0.tar.gz/translations/translators_nb.info -> flacon-5.1.0.tar.gz/translations/translators_nb.info Changed

flacon-5.0.0.tar.gz/translations/translators_nl.info -> flacon-5.1.0.tar.gz/translations/translators_nl.info Changed

flacon-5.0.0.tar.gz/translations/translators_nl_BE.info -> flacon-5.1.0.tar.gz/translations/translators_nl_BE.info Changed

flacon-5.0.0.tar.gz/translations/translators_pl.info -> flacon-5.1.0.tar.gz/translations/translators_pl.info Changed

flacon-5.0.0.tar.gz/translations/translators_pl_PL.info -> flacon-5.1.0.tar.gz/translations/translators_pl_PL.info Changed

flacon-5.0.0.tar.gz/translations/translators_pt_BR.info -> flacon-5.1.0.tar.gz/translations/translators_pt_BR.info Changed

flacon-5.0.0.tar.gz/translations/translators_pt_PT.info -> flacon-5.1.0.tar.gz/translations/translators_pt_PT.info Changed

flacon-5.0.0.tar.gz/translations/translators_ro_RO.info -> flacon-5.1.0.tar.gz/translations/translators_ro_RO.info Changed

flacon-5.0.0.tar.gz/translations/translators_sr.info -> flacon-5.1.0.tar.gz/translations/translators_sr.info Changed

flacon-5.0.0.tar.gz/translations/translators_sr@latin.info -> flacon-5.1.0.tar.gz/translations/translators_sr@latin.info Changed

flacon-5.0.0.tar.gz/translations/translators_tr.info -> flacon-5.1.0.tar.gz/translations/translators_tr.info Changed

flacon-5.0.0.tar.gz/translations/translators_uk.info -> flacon-5.1.0.tar.gz/translations/translators_uk.info Changed

flacon-5.0.0.tar.gz/translations/translators_zh_CN.info -> flacon-5.1.0.tar.gz/translations/translators_zh_CN.info Changed

flacon-5.0.0.tar.gz/translations/translators_zh_TW.info -> flacon-5.1.0.tar.gz/translations/translators_zh_TW.info Changed

flacon-5.0.0.tar.gz/types.cpp -> flacon-5.1.0.tar.gz/types.cpp Changed

@@ -332,3 +332,150 @@
 {
     mHandler = handler;
 }
+
+
+/************************************************
+
+ ************************************************/
+QString safeString(const QString &str)
+{
+    QString res = str;
+    res.replace('|', "-");
+    res.replace('/', "-");
+    res.replace('\\', "-");
+    res.replace(':', "-");
+    res.replace('*', "-");
+    res.replace('?', "-");
+    return res;
+}
+
+
+
+/************************************************
+
+ ************************************************/
+static QString doExpandPattern(const QString &pattern, const QHash<QChar, QString> *tokens, bool optional)
+{
+    QString res;
+    bool perc = false;
+    bool hasVars = false;
+    bool isValid = true;
+
+
+    for(int i=0; i<pattern.length(); ++i)
+    {
+        QChar c = pattern.at(i);
+
+
+        // Sub pattern .................................
+        if (c == '{')
+        {
+            int level = 0;
+            int start = i + 1;
+            //int j = i;
+            QString s = "{";
+
+            for (int j=i; j<pattern.length(); ++j)
+            {
+                c = pattern.at(j);
+                if (c == '{')
+                    level++;
+                else if (c == '}')
+                    level--;
+
+                if (level == 0)
+                {
+                    s = doExpandPattern(pattern.mid(start, j - start), tokens, true);
+                    i = j;
+                    break;
+                }
+            }
+            res += s;
+        }
+        // Sub pattern .................................
+
+        else
+        {
+            if (perc)
+            {
+                perc = false;
+                if (tokens->contains(c))
+                {
+                    QString s = tokens->value(c);
+                    hasVars = true;
+                    isValid = !s.isEmpty();
+                    res += s;
+                }
+                else
+                {
+                    if (c == '%')
+                        res += "%";
+                    else
+                        res += QString("%") + c;
+                }
+            }
+            else
+            {
+                if (c == '%')
+                    perc = true;
+                else
+                    res += c;
+            }
+        }
+    }
+
+    if (perc)
+        res += "%";
+
+    if (optional)
+    {
+        if  (hasVars)
+        {
+            if (!isValid)
+                return "";
+        }
+        else
+        {
+            return "{" + res + "}";
+        }
+    }
+
+    return res;
+}
+
+
+/************************************************
+  %N  Number of tracks       %n  Track number
+  %a  Artist                 %A  Album title
+  %y  Year                   %g  Genre
+  %t  Track title
+ ************************************************/
+QString expandPattern(const QString &pattern,
+                     int trackCount,
+                     int trackNum,
+                     const QString &album,
+                     const QString &title,
+                     const QString &artist,
+                     const QString &genre,
+                     const QString &date)
+{
+    QHash<QChar, QString> tokens;
+    tokens.insert(QChar('N'),   QString("%1").arg(trackCount, 2, 10, QChar('0')));
+    tokens.insert(QChar('n'),   QString("%1").arg(trackNum, 2, 10, QChar('0')));
+    tokens.insert(QChar('A'),   safeString(album));
+    tokens.insert(QChar('t'),   safeString(title));
+    tokens.insert(QChar('a'),   safeString(artist));
+    tokens.insert(QChar('g'),   safeString(genre));
+    tokens.insert(QChar('y'),   safeString(date));
+
+    return doExpandPattern(pattern, &tokens, false);
+}
+
+
+/************************************************
+ *
+ ************************************************/
+QString patternExample(const QString &pattern)
+{
+    return expandPattern(pattern, 14, 13, "Help", "Yesterday", "The Beatles", "Pop", "1965");
+}

flacon-5.0.0.tar.gz/types.h -> flacon-5.1.0.tar.gz/types.h Changed

Changes of Revision 26