summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libk3b/core/k3bdefaultexternalprograms.cpp75
-rw-r--r--libk3b/core/k3bdefaultexternalprograms.h16
-rw-r--r--libk3b/plugin/k3bpluginconfigwidget.cpp2
-rw-r--r--libk3b/plugin/k3bpluginfactory.h2
-rw-r--r--libk3b/plugin/k3bpluginmanager.cpp4
-rw-r--r--libk3b/projects/audiocd/k3baudionormalizejob.cpp30
-rw-r--r--plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp2
-rw-r--r--plugins/encoder/lame/k3blameencoder.cpp2
-rw-r--r--plugins/encoder/sox/k3bsoxencoder.cpp171
-rw-r--r--plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp2
-rw-r--r--plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp2
-rw-r--r--src/k3b.cpp4
-rw-r--r--src/k3bthememanager.cpp4
-rw-r--r--src/main.cpp2
-rw-r--r--src/option/k3bdevicewidget.cpp2
-rw-r--r--tdeioslaves/videodvd/videodvd.cpp2
-rw-r--r--translations/desktop_files/es_AR.po9
-rw-r--r--translations/desktop_files/eventsrc/hu.po15
-rw-r--r--translations/desktop_files/hu.po89
19 files changed, 232 insertions, 203 deletions
diff --git a/libk3b/core/k3bdefaultexternalprograms.cpp b/libk3b/core/k3bdefaultexternalprograms.cpp
index 4b86055..7fbace6 100644
--- a/libk3b/core/k3bdefaultexternalprograms.cpp
+++ b/libk3b/core/k3bdefaultexternalprograms.cpp
@@ -49,13 +49,13 @@ void K3b::addDefaultPrograms( K3bExternalBinManager* m )
void K3b::addTranscodePrograms( K3bExternalBinManager* m )
{
static const char* transcodeTools[] = { "transcode",
- 0, // K3b 1.0 only uses the transcode binary
- "tcprobe",
- "tccat",
- "tcscan",
- "tcextract",
- "tcdecode",
- 0 };
+ 0, // K3b 1.0 only uses the transcode binary
+ "tcprobe",
+ "tccat",
+ "tcscan",
+ "tcextract",
+ "tcdecode",
+ 0 };
for( int i = 0; transcodeTools[i]; ++i )
m->addProgram( new K3bTranscodeProgram( transcodeTools[i] ) );
@@ -102,16 +102,16 @@ static TQString& debianWeirdnessHack( TQString& path )
f.open( IO_ReadOnly );
TQString s = TQTextStream( &f ).read();
if( s.contains( "cdrecord.mmap" ) && s.contains( "cdrecord.shm" ) ) {
- kdDebug() << "(K3bCdrecordProgram) Found Debian Wrapper script." << endl;
- TQString ext;
- if( K3b::kernelVersion().versionString().left(3) > "2.2" )
- ext = ".mmap";
- else
- ext = ".shm";
+ kdDebug() << "(K3bCdrecordProgram) Found Debian Wrapper script." << endl;
+ TQString ext;
+ if( K3b::kernelVersion().versionString().left(3) > "2.2" )
+ ext = ".mmap";
+ else
+ ext = ".shm";
- kdDebug() << "(K3bCdrecordProgram) Using cdrecord" << ext << endl;
+ kdDebug() << "(K3bCdrecordProgram) Using cdrecord" << ext << endl;
- path += ext;
+ path += ext;
}
}
}
@@ -214,7 +214,7 @@ bool K3bCdrecordProgram::scan( const TQString& p )
if( out.output().contains( "-tao" ) )
bin->addFeature( "tao" );
if( out.output().contains( "cuefile=" ) &&
- ( wodim || bin->version > K3bVersion( 2, 1, -1, "a14") ) ) // cuefile handling was still buggy in a14
+ ( wodim || bin->version > K3bVersion( 2, 1, -1, "a14") ) ) // cuefile handling was still buggy in a14
bin->addFeature( "cuefile" );
// new mode 2 options since cdrecord 2.01a12
@@ -223,15 +223,15 @@ bool K3bCdrecordProgram::scan( const TQString& p )
// two checks)
// and the version check does not handle versions like 2.01-dvd properly
if( out.output().contains( "-xamix" ) ||
- bin->version >= K3bVersion( 2, 1, -1, "a12" ) ||
- wodim )
+ bin->version >= K3bVersion( 2, 1, -1, "a12" ) ||
+ wodim )
bin->addFeature( "xamix" );
// check if we run cdrecord as root
struct stat s;
if( !::stat( TQFile::encodeName(path), &s ) ) {
if( (s.st_mode & S_ISUID) && s.st_uid == 0 )
- bin->addFeature( "suidroot" );
+ bin->addFeature( "suidroot" );
}
}
else {
@@ -352,7 +352,7 @@ bool K3bMkisofsProgram::scan( const TQString& p )
struct stat s;
if( !::stat( TQFile::encodeName(path), &s ) ) {
if( (s.st_mode & S_ISUID) && s.st_uid == 0 )
- bin->addFeature( "suidroot" );
+ bin->addFeature( "suidroot" );
}
}
else {
@@ -458,7 +458,7 @@ bool K3bReadcdProgram::scan( const TQString& p )
struct stat s;
if( !::stat( TQFile::encodeName(path), &s ) ) {
if( (s.st_mode & S_ISUID) && s.st_uid == 0 )
- bin->addFeature( "suidroot" );
+ bin->addFeature( "suidroot" );
}
}
else {
@@ -551,7 +551,7 @@ bool K3bCdrdaoProgram::scan( const TQString& p )
struct stat s;
if( !::stat( TQFile::encodeName(path), &s ) ) {
if( (s.st_mode & S_ISUID) && s.st_uid == 0 )
- bin->addFeature( "suidroot" );
+ bin->addFeature( "suidroot" );
}
}
else {
@@ -712,20 +712,41 @@ K3bNormalizeProgram::K3bNormalizeProgram()
{
}
+TQStringList K3bNormalizeProgram::binNames() const {
+ TQStringList rv;
+ rv << "normalize-audio" << "normalize";
+ return rv;
+}
bool K3bNormalizeProgram::scan( const TQString& p )
{
if( p.isEmpty() )
return false;
- TQString path = p;
- TQFileInfo fi( path );
+ bool found = false;
+
+ TQFileInfo fi( p );
if( fi.isDir() ) {
- if( path[path.length()-1] != '/' )
- path.append("/");
- path.append("normalize-audio");
+
+ for(const auto & name: binNames()) {
+ TQString path = p;
+ if( path[path.length()-1] != '/' )
+ path.append("/");
+ path.append(name);
+
+ if( verifyAddBin(path) )
+ found = true;
+ }
+ } else {
+ if( verifyAddBin(p) )
+ found = true;
}
+ return found;
+}
+
+
+bool K3bNormalizeProgram::verifyAddBin( const TQString& path ) {
if( !TQFile::exists( path ) )
return false;
diff --git a/libk3b/core/k3bdefaultexternalprograms.h b/libk3b/core/k3bdefaultexternalprograms.h
index bc4d41c..daca769 100644
--- a/libk3b/core/k3bdefaultexternalprograms.h
+++ b/libk3b/core/k3bdefaultexternalprograms.h
@@ -102,6 +102,22 @@ class LIBK3B_EXPORT K3bNormalizeProgram : public K3bExternalProgram
K3bNormalizeProgram();
bool scan( const TQString& );
+ protected:
+ /**
+ * Returns list of names the executable of this program could be called
+ */
+ TQStringList binNames() const;
+
+ /**
+ * Verifies if binary on the given path suitable to be used by k3b and
+ * addBin()s it if so
+ */
+ bool verifyAddBin( const TQString& path );
+
+ /**
+ * @note: it would make sense to make binNames() and verifyBin() virtuals in
+ * K3bExternalProgram and reimplement scan() in a more generic way.
+ */
};
diff --git a/libk3b/plugin/k3bpluginconfigwidget.cpp b/libk3b/plugin/k3bpluginconfigwidget.cpp
index 21876d5..5b847fb 100644
--- a/libk3b/plugin/k3bpluginconfigwidget.cpp
+++ b/libk3b/plugin/k3bpluginconfigwidget.cpp
@@ -18,7 +18,7 @@
#include <k3bcore.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kdebug.h>
diff --git a/libk3b/plugin/k3bpluginfactory.h b/libk3b/plugin/k3bpluginfactory.h
index dde5e9f..e812fef 100644
--- a/libk3b/plugin/k3bpluginfactory.h
+++ b/libk3b/plugin/k3bpluginfactory.h
@@ -18,7 +18,7 @@
#define _K3B_PLUGIN_FACTORY_H_
#include <klibloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdeglobal.h>
#include <tdelocale.h>
diff --git a/libk3b/plugin/k3bpluginmanager.cpp b/libk3b/plugin/k3bpluginmanager.cpp
index 9981070..364e76b 100644
--- a/libk3b/plugin/k3bpluginmanager.cpp
+++ b/libk3b/plugin/k3bpluginmanager.cpp
@@ -19,7 +19,7 @@
#include <k3bversion.h>
#include <kdebug.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
#include <tdelocale.h>
#include <tdeglobal.h>
#include <tdestandarddirs.h>
@@ -85,7 +85,7 @@ TQPtrList<K3bPlugin> K3bPluginManager::plugins( const TQString& group ) const
void K3bPluginManager::loadPlugin( const TQString& fileName )
{
- KSimpleConfig c( fileName, true );
+ TDESimpleConfig c( fileName, true );
c.setGroup( "K3b Plugin" );
TQString libName = c.readEntry( "Lib" );
diff --git a/libk3b/projects/audiocd/k3baudionormalizejob.cpp b/libk3b/projects/audiocd/k3baudionormalizejob.cpp
index 85fd698..beb05fb 100644
--- a/libk3b/projects/audiocd/k3baudionormalizejob.cpp
+++ b/libk3b/projects/audiocd/k3baudionormalizejob.cpp
@@ -131,18 +131,18 @@ void K3bAudioNormalizeJob::slotStdLine( const TQString& line )
if( m_currentAction == ADJUSTING_LEVELS ) {
emit newTask( i18n("Adjusting volume level for track %1 of %2").arg(m_currentTrack).arg(m_files.count()) );
kdDebug() << "(K3bAudioNormalizeJob) adjusting level for track "
- << m_currentTrack
- << " "
- << m_files.at(m_currentTrack-1)
- << endl;
+ << m_currentTrack
+ << " "
+ << m_files.at(m_currentTrack-1)
+ << endl;
}
else {
emit newTask( i18n("Computing level for track %1 of %2").arg(m_currentTrack).arg(m_files.count()) );
kdDebug() << "(K3bAudioNormalizeJob) computing level for track "
- << m_currentTrack
- << " "
- << m_files.at(m_currentTrack-1)
- << endl;
+ << m_currentTrack
+ << " "
+ << m_files.at(m_currentTrack-1)
+ << endl;
}
m_currentTrack++;
@@ -159,7 +159,7 @@ void K3bAudioNormalizeJob::slotStdLine( const TQString& line )
emit subPercent( p );
else
kdDebug() << "(K3bAudioNormalizeJob) subPercent parsing error at pos "
- << 19 << " in line '" << line.mid( 19, 3 ) << "'" << endl;
+ << 19 << " in line '" << line.mid( 19, 3 ) << "'" << endl;
// batch progress starts at position 50 in version 0.7.6
p = line.mid( 50, 3 ).toInt(&ok);
@@ -169,7 +169,7 @@ void K3bAudioNormalizeJob::slotStdLine( const TQString& line )
emit percent( 50 + (int)((double)p/2.0) );
else
kdDebug() << "(K3bAudioNormalizeJob) percent parsing error at pos "
- << 50 << " in line '" << line.mid( 50, 3 ) << "'" << endl;
+ << 50 << " in line '" << line.mid( 50, 3 ) << "'" << endl;
}
}
@@ -185,13 +185,13 @@ void K3bAudioNormalizeJob::slotProcessExited( TDEProcess* p )
break;
default:
if( !m_canceled ) {
- emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg("normalize-audio").arg(p->exitStatus()),
- K3bJob::ERROR );
- emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR );
- emit infoMessage( i18n("Error while normalizing tracks."), ERROR );
+ emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg("normalize-audio").arg(p->exitStatus()),
+ K3bJob::ERROR );
+ emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR );
+ emit infoMessage( i18n("Error while normalizing tracks."), ERROR );
}
else
- emit canceled();
+ emit canceled();
jobFinished(false);
break;
}
diff --git a/plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp b/plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp
index ad094a6..6e00aa1 100644
--- a/plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp
+++ b/plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp
@@ -26,7 +26,7 @@
#include <kurl.h>
#include <kdebug.h>
#include <tdelocale.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <math.h>
diff --git a/plugins/encoder/lame/k3blameencoder.cpp b/plugins/encoder/lame/k3blameencoder.cpp
index 9b08dcd..3be21df 100644
--- a/plugins/encoder/lame/k3blameencoder.cpp
+++ b/plugins/encoder/lame/k3blameencoder.cpp
@@ -23,7 +23,7 @@
#include <tdelocale.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <knuminput.h>
#include <kcombobox.h>
#include <kdialogbase.h>
diff --git a/plugins/encoder/sox/k3bsoxencoder.cpp b/plugins/encoder/sox/k3bsoxencoder.cpp
index 8b170f6..1cc7c3a 100644
--- a/plugins/encoder/sox/k3bsoxencoder.cpp
+++ b/plugins/encoder/sox/k3bsoxencoder.cpp
@@ -34,6 +34,7 @@
#include <tqcombobox.h>
#include <tqcheckbox.h>
#include <tqlayout.h>
+#include <tqregexp.h>
#include <sys/types.h>
#include <sys/wait.h>
@@ -58,61 +59,47 @@ class K3bSoxProgram : public K3bExternalProgram
TQFileInfo fi( path );
if( fi.isDir() ) {
if( path[path.length()-1] != '/' )
- path.append("/");
+ path.append("/");
path.append("sox");
}
if( !TQFile::exists( path ) )
return false;
- K3bExternalBin* bin = 0;
-
// probe version
TDEProcess vp;
K3bProcessOutputCollector out( &vp );
vp << path << "-h";
if( vp.start( TDEProcess::Block, TDEProcess::AllOutput ) ) {
- int pos = out.output().find( "sox: SoX Version" );
- if ( pos < 0 )
- pos = out.output().find( "sox: SoX v" ); // newer sox versions
- int endPos = out.output().find( "\n", pos );
- if( pos > 0 && endPos > 0 ) {
- pos += 17;
- bin = new K3bExternalBin( this );
- bin->path = path;
- bin->version = out.output().mid( pos, endPos-pos );
-
- addBin( bin );
-
- return true;
- }
- else {
- pos = out.output().find( "sox: Version" );
- endPos = out.output().find( "\n", pos );
- if( pos > 0 && endPos > 0 ) {
- pos += 13;
- bin = new K3bExternalBin( this );
- bin->path = path;
- bin->version = out.output().mid( pos, endPos-pos );
-
- addBin( bin );
-
- return true;
+ TQRegExp versionRe ("sox: +(SoX )?(Version |v)([^\\n]+)");
+ // Should match:
+ // * sox: Version 12.2.3
+ // * sox: SoX Version 12.18.1
+ // * sox: SoX v14.0.0
+ // * sox: SoX v14.4.0
+ int pos = versionRe.search( out.output() );
+ if( pos > 0 ) {
+ TQString version = versionRe.cap(3);
+
+ K3bExternalBin* bin = new K3bExternalBin( this );
+
+ bin->path = path;
+ bin->version = version;
+
+ addBin( bin );
+
+ return true;
}
- else
- return false;
- }
}
- else
- return false;
+ return false;
}
};
class K3bSoxEncoder::Private
{
-public:
+ public:
Private()
: process(0) {
}
@@ -183,20 +170,20 @@ bool K3bSoxEncoder::initEncoderInternal( const TQString& extension )
d->process->setRawStdin(true);
connect( d->process, TQ_SIGNAL(processExited(TDEProcess*)),
- this, TQ_SLOT(slotSoxFinished(TDEProcess*)) );
+ this, TQ_SLOT(slotSoxFinished(TDEProcess*)) );
connect( d->process, TQ_SIGNAL(stderrLine(const TQString&)),
- this, TQ_SLOT(slotSoxOutputLine(const TQString&)) );
+ this, TQ_SLOT(slotSoxOutputLine(const TQString&)) );
connect( d->process, TQ_SIGNAL(stdoutLine(const TQString&)),
- this, TQ_SLOT(slotSoxOutputLine(const TQString&)) );
+ this, TQ_SLOT(slotSoxOutputLine(const TQString&)) );
// input settings
*d->process << soxBin->path
- << "-t" << "raw" // raw samples
- << "-r" << "44100" // samplerate
- << "-s" // signed linear
- << "-w" // 16-bit words
- << "-c" << "2" // stereo
- << "-"; // read from stdin
+ << "-t" << "raw" // raw samples
+ << "-r" << "44100" // samplerate
+ << "-s" // signed linear
+ << "-w" // 16-bit words
+ << "-c" << "2" // stereo
+ << "-"; // read from stdin
// output settings
*d->process << "-t" << extension;
@@ -205,28 +192,28 @@ bool K3bSoxEncoder::initEncoderInternal( const TQString& extension )
c->setGroup( "K3bSoxEncoderPlugin" );
if( c->readBoolEntry( "manual settings", false ) ) {
*d->process << "-r" << TQString::number( c->readNumEntry( "samplerate", 44100 ) )
- << "-c" << TQString::number( c->readNumEntry( "channels", 2 ) );
+ << "-c" << TQString::number( c->readNumEntry( "channels", 2 ) );
int size = c->readNumEntry( "data size", 16 );
*d->process << ( size == 8 ? TQString("-b") : ( size == 32 ? TQString("-l") : TQString("-w") ) );
TQString encoding = c->readEntry( "data encoding", "signed" );
if( encoding == "unsigned" )
- *d->process << "-u";
+ *d->process << "-u";
else if( encoding == "u-law" )
- *d->process << "-U";
+ *d->process << "-U";
else if( encoding == "A-law" )
- *d->process << "-A";
+ *d->process << "-A";
else if( encoding == "ADPCM" )
- *d->process << "-a";
+ *d->process << "-a";
else if( encoding == "IMA_ADPCM" )
- *d->process << "-i";
+ *d->process << "-i";
else if( encoding == "GSM" )
- *d->process << "-g";
+ *d->process << "-g";
else if( encoding == "Floating-point" )
- *d->process << "-f";
+ *d->process << "-f";
else
- *d->process << "-s";
+ *d->process << "-s";
}
*d->process << d->fileName;
@@ -273,24 +260,24 @@ TQStringList K3bSoxEncoder::extensions() const
static TQStringList s_extensions;
if( s_extensions.isEmpty() ) {
s_extensions << "au"
- << "8svx"
- << "aiff"
- << "avr"
- << "cdr"
- << "cvs"
- << "dat"
- << "gsm"
- << "hcom"
- << "maud"
- << "sf"
- << "sph"
- << "smp"
- << "txw"
- << "vms"
- << "voc"
- << "wav"
- << "wve"
- << "raw";
+ << "8svx"
+ << "aiff"
+ << "avr"
+ << "cdr"
+ << "cvs"
+ << "dat"
+ << "gsm"
+ << "hcom"
+ << "maud"
+ << "sf"
+ << "sph"
+ << "smp"
+ << "txw"
+ << "vms"
+ << "voc"
+ << "wav"
+ << "wve"
+ << "raw";
}
if( k3bcore->externalBinManager()->foundBin( "sox" ) )
@@ -348,24 +335,24 @@ TQString K3bSoxEncoder::fileTypeComment( const TQString& ext ) const
long long K3bSoxEncoder::fileSize( const TQString&, const K3b::Msf& msf ) const
{
// for now we make a rough assumption based on the settings
- TDEConfig* c = k3bcore->config();
- c->setGroup( "K3bSoxEncoderPlugin" );
- if( c->readBoolEntry( "manual settings", false ) ) {
- int sr = c->readNumEntry( "samplerate", 44100 );
- int ch = c->readNumEntry( "channels", 2 );
- int wsize = c->readNumEntry( "data size", 16 );
+ TDEConfig* c = k3bcore->config();
+ c->setGroup( "K3bSoxEncoderPlugin" );
+ if( c->readBoolEntry( "manual settings", false ) ) {
+ int sr = c->readNumEntry( "samplerate", 44100 );
+ int ch = c->readNumEntry( "channels", 2 );
+ int wsize = c->readNumEntry( "data size", 16 );
- return msf.totalFrames()*sr*ch*wsize/75;
- }
- else {
- // fallback to raw
- return msf.audioBytes();
- }
+ return msf.totalFrames()*sr*ch*wsize/75;
+ }
+ else {
+ // fallback to raw
+ return msf.audioBytes();
+ }
}
K3bPluginConfigWidget* K3bSoxEncoder::createConfigWidget( TQWidget* parent,
- const char* name ) const
+ const char* name ) const
{
return new K3bSoxEncoderSettingsWidget( parent, name );
}
@@ -435,16 +422,16 @@ void K3bSoxEncoderSettingsWidget::saveConfig()
c->writeEntry( "manual settings", w->m_checkManual->isChecked() );
c->writeEntry( "channels", w->m_comboChannels->currentItem() == 0
- ? 1
- : ( w->m_comboChannels->currentItem() == 2
- ? 4
- : 2 ) );
+ ? 1
+ : ( w->m_comboChannels->currentItem() == 2
+ ? 4
+ : 2 ) );
c->writeEntry( "data size", w->m_comboSize->currentItem() == 0
- ? 8
- : ( w->m_comboSize->currentItem() == 2
- ? 32
- : 16 ) );
+ ? 8
+ : ( w->m_comboSize->currentItem() == 2
+ ? 32
+ : 16 ) );
c->writeEntry( "samplerate", w->m_editSamplerate->text().toInt() );
diff --git a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp
index d4f4334..b6a15f2 100644
--- a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp
+++ b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp
@@ -26,7 +26,7 @@
#include <k3bpluginfactory.h>
#include <kdebug.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <tdelocale.h>
#include <tdefilemetainfo.h>
diff --git a/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp b/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp
index 7d254f8..ca5ef94 100644
--- a/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp
+++ b/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp
@@ -33,7 +33,7 @@
#include <kdebug.h>
#include <tdeaction.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <tdelocale.h>
#include <tdeconfig.h>
diff --git a/src/k3b.cpp b/src/k3b.cpp
index 90d257f..07c312f 100644
--- a/src/k3b.cpp
+++ b/src/k3b.cpp
@@ -625,7 +625,7 @@ void K3bMainWindow::saveProperties( TDEConfig* c )
// FIXME: for some reason the config entries are not properly stored when using the default
// TDEMainWindow session config. Since I was not able to find the bug I use another config object
// ----------------------------------------------------------
- c = new KSimpleConfig( saveDir + "list", false );
+ c = new TDESimpleConfig( saveDir + "list", false );
c->setGroup( "Saved Session" );
// ----------------------------------------------------------
@@ -680,7 +680,7 @@ void K3bMainWindow::readProperties( TDEConfig* c )
// FIXME: for some reason the config entries are not properly stored when using the default
// TDEMainWindow session config. Since I was not able to find the bug I use another config object
// ----------------------------------------------------------
- c = new KSimpleConfig( saveDir + "list", true );
+ c = new TDESimpleConfig( saveDir + "list", true );
c->setGroup( "Saved Session" );
// ----------------------------------------------------------
diff --git a/src/k3bthememanager.cpp b/src/k3bthememanager.cpp
index 98490f8..22b0512 100644
--- a/src/k3bthememanager.cpp
+++ b/src/k3bthememanager.cpp
@@ -19,7 +19,7 @@
#include <tdestandarddirs.h>
#include <tdeglobalsettings.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
#include <kdebug.h>
#include <tdeglobal.h>
@@ -308,7 +308,7 @@ void K3bThemeManager::loadTheme( const TQString& name )
t->m_local = fi.isWritable();
// load the stuff
- KSimpleConfig cfg( path, true );
+ TDESimpleConfig cfg( path, true );
t->m_author = cfg.readEntry( "Author" );
t->m_comment = cfg.readEntry( "Comment" );
t->m_version = cfg.readEntry( "Version" );
diff --git a/src/main.cpp b/src/main.cpp
index 8798dbe..3a3e398 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -20,7 +20,7 @@
#include <tdeprocess.h>
#include <tdemessagebox.h>
#include <tdestandarddirs.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
#include <kstdguiitem.h>
#include <kdebug.h>
#include <dcopclient.h>
diff --git a/src/option/k3bdevicewidget.cpp b/src/option/k3bdevicewidget.cpp
index ef7cc32..3be241c 100644
--- a/src/option/k3bdevicewidget.cpp
+++ b/src/option/k3bdevicewidget.cpp
@@ -26,7 +26,7 @@
#include <kdialog.h>
#include <tdelocale.h>
#include <tdeconfig.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
#include <kiconloader.h>
#include <tdestandarddirs.h>
#include <tdeio/global.h>
diff --git a/tdeioslaves/videodvd/videodvd.cpp b/tdeioslaves/videodvd/videodvd.cpp
index 297ea61..502674f 100644
--- a/tdeioslaves/videodvd/videodvd.cpp
+++ b/tdeioslaves/videodvd/videodvd.cpp
@@ -21,7 +21,7 @@
#include <tqptrlist.h>
#include <kdebug.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdeglobal.h>
#include <tdelocale.h>
#include <kurl.h>
diff --git a/translations/desktop_files/es_AR.po b/translations/desktop_files/es_AR.po
index 22c82b5..79ec6de 100644
--- a/translations/desktop_files/es_AR.po
+++ b/translations/desktop_files/es_AR.po
@@ -2,13 +2,14 @@
# This file is put in the public domain.
# Slávek Banko <slavek.banko@axis.cz>, 2025.
# Máximo Vega <veegamaxi@gmail.com>, 2025.
+# Alejo Fernández <alejofernandez@hotmail.com.ar>, 2025.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-08-31 18:33+0000\n"
-"PO-Revision-Date: 2025-06-24 16:59+0000\n"
-"Last-Translator: Máximo Vega <veegamaxi@gmail.com>\n"
+"PO-Revision-Date: 2025-07-07 06:59+0000\n"
+"Last-Translator: Alejo Fernández <alejofernandez@hotmail.com.ar>\n"
"Language-Team: Spanish (Argentina) <https://mirror.git.trinitydesktop.org/"
"weblate/projects/applications/k3b-desktop-files/es_AR/>\n"
"Language: es_AR\n"
@@ -104,12 +105,12 @@ msgstr "Un tema semitransparente que utiliza el color de tu sistema. "
#. Comment
#: src/pics/crystal/k3b.theme:4
msgid "The cool crystal theme"
-msgstr "El tema cristalino cool"
+msgstr "El tema cristalino copado"
#. Comment
#: src/pics/quant/k3b.theme:4
msgid "New official theme for K3b. Enjoy! "
-msgstr "Nuevo tema oficial por K3b. Disfrutá! "
+msgstr "Nuevo tema oficial por K3b, ¡Disfrutá! "
#. Name
#: plugins/audiooutput/alsa/k3balsaoutputplugin.plugin:2
diff --git a/translations/desktop_files/eventsrc/hu.po b/translations/desktop_files/eventsrc/hu.po
index cc7fa5f..172ed99 100644
--- a/translations/desktop_files/eventsrc/hu.po
+++ b/translations/desktop_files/eventsrc/hu.po
@@ -1,25 +1,26 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Szia Tomi <sziatomi01@gmail.com>, 2025.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-08-27 17:13+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2025-12-07 05:51+0000\n"
+"Last-Translator: Szia Tomi <sziatomi01@gmail.com>\n"
+"Language-Team: Hungarian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/applications/k3b-events/hu/>\n"
"Language: hu\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.18.2\n"
#. Comment
#: eventsrc:3
msgid "K3b"
-msgstr ""
+msgstr "K3b"
#. Name
#: eventsrc:6
diff --git a/translations/desktop_files/hu.po b/translations/desktop_files/hu.po
index 4913986..2ffac88 100644
--- a/translations/desktop_files/hu.po
+++ b/translations/desktop_files/hu.po
@@ -1,25 +1,26 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Szia Tomi <sziatomi01@gmail.com>, 2025.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-08-31 18:33+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2025-12-04 21:51+0000\n"
+"Last-Translator: Szia Tomi <sziatomi01@gmail.com>\n"
+"Language-Team: Hungarian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/applications/k3b-desktop-files/hu/>\n"
"Language: hu\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.18.2\n"
#. Name
#: src/k3b-cue.desktop:2 src/k3b.desktop:2
msgid "K3b"
-msgstr ""
+msgstr "K3b"
#. GenericName
#: src/k3b.desktop:4
@@ -92,172 +93,173 @@ msgstr "K3b-projekt"
#. Comment
#: src/pics/73lab/k3b.theme:4
msgid "Ayo's original K3b theme"
-msgstr ""
+msgstr "Az eredeti K3b téma (Ayo)"
#. Comment
#: src/pics/RobsTheme/k3b.theme:4
msgid "A semitransparent theme that uses your system colors. "
-msgstr ""
+msgstr "Félig átlátszó téma, amely a rendszer színeit használja. "
#. Comment
#: src/pics/crystal/k3b.theme:4
msgid "The cool crystal theme"
-msgstr ""
+msgstr "Kristály téma"
#. Comment
#: src/pics/quant/k3b.theme:4
msgid "New official theme for K3b. Enjoy! "
-msgstr ""
+msgstr "Az új hivatalos téma a K3b-hez. Érezd jól magad! "
#. Name
#: plugins/audiooutput/alsa/k3balsaoutputplugin.plugin:2
msgid "K3b Alsa Audio Output Plugin"
-msgstr ""
+msgstr "K3b „alsa” hangkimeneti modul"
#. Comment
#: plugins/audiooutput/alsa/k3balsaoutputplugin.plugin:3
msgid "Audio Output plugin which plays through alsa"
-msgstr ""
+msgstr "Hangkimeneti modul, amely az „alsa” hangrendszeren keresztül játszik le"
#. Name
#: plugins/audiooutput/arts/k3bartsoutputplugin.plugin:2
msgid "K3b Arts Audio Output Plugin"
-msgstr ""
+msgstr "K3b „arts” hangkimeneti modul"
#. Comment
#: plugins/audiooutput/arts/k3bartsoutputplugin.plugin:3
msgid "Audio Output plugin which plays through arts"
-msgstr ""
+msgstr "Hangkimeneti modul, amely az „arts” hangrendszeren keresztül játszik le"
#. Name
#: plugins/decoder/ffmpeg/k3bffmpegdecoder.plugin:2
msgid "K3b FFMpeg Decoder"
-msgstr ""
+msgstr "K3b FFMpeg dekódoló"
#. Comment
#: plugins/decoder/ffmpeg/k3bffmpegdecoder.plugin:3
msgid "Decoding module to decode wma files"
-msgstr ""
+msgstr "Dekódoló modul wma fájlok dekódolásához"
#. Name
#: plugins/decoder/flac/k3bflacdecoder.plugin:2
msgid "K3b FLAC Decoder"
-msgstr ""
+msgstr "K3b FLAC dekódoló"
#. Comment
#: plugins/decoder/flac/k3bflacdecoder.plugin:3
msgid "Decoding module to decode FLAC files"
-msgstr ""
+msgstr "Dekódoló modul FLAC fájlok dekódolásához"
#. Name
#: plugins/decoder/libsndfile/k3blibsndfiledecoder.plugin:2
msgid "K3b Libsndfile Decoder"
-msgstr ""
+msgstr "K3b Libsndfile dekódoló"
#. Comment
#: plugins/decoder/libsndfile/k3blibsndfiledecoder.plugin:3
msgid "Decoding module to decode audio files supported by libsndfile"
-msgstr ""
+msgstr "Dekódoló modul a libsndfile által támogatott hangfájlok dekódolásához"
#. Name
#: plugins/decoder/mp3/k3bmaddecoder.plugin:2
msgid "K3b MAD Decoder"
-msgstr ""
+msgstr "K3b MAD dekódoló"
#. Comment
#: plugins/decoder/mp3/k3bmaddecoder.plugin:3
msgid "Decoding module to decode MPEG 1 Layer III files"
-msgstr ""
+msgstr "Dekódoló modul MPEG 1 Layer III fájlok dekódolásához"
#. Name
#: plugins/decoder/musepack/k3bmpcdecoder.plugin:2
msgid "K3b Musepack Decoder"
-msgstr ""
+msgstr "K3b Musepack dekódoló"
#. Comment
#: plugins/decoder/musepack/k3bmpcdecoder.plugin:3
msgid "Decoding module to decode Musepack audio files"
-msgstr ""
+msgstr "Dekódoló modul Musepack hangfájlok dekódolásához"
#. Name
#: plugins/decoder/ogg/k3boggvorbisdecoder.plugin:2
msgid "K3b Ogg Vorbis Decoder"
-msgstr ""
+msgstr "K3b Ogg Vorbis dekódoló"
#. Comment
#: plugins/decoder/ogg/k3boggvorbisdecoder.plugin:3
msgid "Decoding module to decode Ogg Vorbis files"
-msgstr ""
+msgstr "Dekódoló modul Ogg Vorbis fájlok dekódolásához"
#. Name
#: plugins/decoder/wave/k3bwavedecoder.plugin:2
msgid "K3b Wave Decoder"
-msgstr ""
+msgstr "K3b Wave dekódoló"
#. Comment
#: plugins/decoder/wave/k3bwavedecoder.plugin:3
msgid "Decoding module to decode wave files"
-msgstr ""
+msgstr "Dekódoló modul „wave” fájlok dekódolásához"
#. Name
#: plugins/encoder/external/k3bexternalencoder.plugin:2
msgid "K3b External Audio Encoder"
-msgstr ""
+msgstr "K3b külső hangkódoló"
#. Comment
#: plugins/encoder/external/k3bexternalencoder.plugin:3
msgid "Encoding module that allows specifying an encoding commmand"
-msgstr ""
+msgstr "Kódolási modul, amely lehetővé teszi kódolási parancs megadását"
#. Name
#: plugins/encoder/lame/k3blameencoder.plugin:2
msgid "K3b Lame Mp3 Encoder"
-msgstr ""
+msgstr "K3b Lame Mp3 kódoló"
#. Comment
#: plugins/encoder/lame/k3blameencoder.plugin:3
msgid "Encoding module to encode MPEG1 Layer III (mp3) files"
-msgstr ""
+msgstr "Kódoló modul MPEG1 Layer III (mp3) fájlok kódolásához"
#. Name
#: plugins/encoder/ogg/k3boggvorbisencoder.plugin:2
msgid "K3b Ogg Vorbis Encoder"
-msgstr ""
+msgstr "K3b Ogg Vorbis kódoló"
#. Comment
#: plugins/encoder/ogg/k3boggvorbisencoder.plugin:3
msgid "Encoding module to encode Ogg Vorbis files"
-msgstr ""
+msgstr "Kódoló modul Ogg Vorbis fájlok kódolásához"
#. Name
#: plugins/encoder/sox/k3bsoxencoder.plugin:2
msgid "K3b SoX Audio Encoder"
-msgstr ""
+msgstr "K3b SoX Audio kódoló"
#. Comment
#: plugins/encoder/sox/k3bsoxencoder.plugin:3
msgid "Encoding module to encode many file formats using SoX"
-msgstr ""
+msgstr "Kódoló modul számos fájlformátum kódolásához SoX használatával"
#. Name
#: plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.plugin:2
msgid "K3b Audio Metainfo Renamer"
-msgstr ""
+msgstr "K3b Audio Metainfo átnevező"
#. Comment
#: plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.plugin:3
msgid "Plugin to rename audio files in a data project based on the meta info."
msgstr ""
+"Modul audiofájlok átnevezéséhez egy adatprojektben a metaadatok alapján."
#. Name
#: plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.plugin:2
msgid "K3b Cddb Audio Plugin"
-msgstr ""
+msgstr "K3b Cddb audió modul"
#. Comment
#: plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.plugin:3
msgid "Plugin to query a cddb server for information about an audio project."
-msgstr ""
+msgstr "Modul a CDDB kiszolgáló lekérdezéséhez az audio projektről."
#. Name
#: tdefile-plugins/k3bproject/tdefile_k3b.desktop:2
@@ -275,12 +277,13 @@ msgid ""
"A tdeioslave that allows files to be copied from a Video DVD (including "
"decryption)"
msgstr ""
-"Kioslave, amellyel fájlokat lehet másolni Video DVD-ről (dekódolással együtt)"
+"A „tdeioslave” (be-/kimeneti modul), amellyel fájlokat lehet másolni Video "
+"DVD-ről (beleértve a visszafejtést is)"
#. Name
#: k3bsetup/k3bsetup2.desktop:2
msgid "K3bSetup"
-msgstr ""
+msgstr "K3bSetup (beállítási segédprogram)"
#. GenericName
#: k3bsetup/k3bsetup2.desktop:4
@@ -295,4 +298,4 @@ msgstr "K3bSetup 2 - jogosultságbeállítás CD/DVD-íráshoz a K3b-ben"
#. Keywords
#: k3bsetup/k3bsetup2.desktop:8
msgid "K3bSetup2;k3bsetup2;"
-msgstr ""
+msgstr "K3bSetup2;k3bsetup2;"
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-11 06:16:16 +0000