123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821822823824825826827828829830831832833834835836837838839840841842843844845846847848849850851852853854855856857858859860861862863864865866867868869870871872873874875876877878879880881882883884885886887888889890891892893894895896897898899900901902903904905906907908909910911912913914915916917918919920921922923924925926927928929930931932933934935936937938939940941942943 |
- diff -Naur k9copy-work/src/assistant/k9aststreams.cpp k9copy/src/assistant/k9aststreams.cpp
- --- k9copy-work/src/assistant/k9aststreams.cpp 2014-09-29 11:00:12.000000000 -0400
- +++ k9copy/src/assistant/k9aststreams.cpp 2020-12-23 23:53:38.473154933 -0500
- @@ -54,7 +54,7 @@
- showDefault(false);
- setFlags(Qt::ItemIsEnabled | Qt::ItemIsUserCheckable | Qt::ItemIsSelectable);
- setCheckState(0,_stream->getselected()?Qt::Checked:Qt::Unchecked);
- - setText(0,i18n("%4 - %1 %2 %3 ch").arg(_stream->getlanguage()).arg(_stream->getformat()).arg(_stream->getchannels()).arg(_stream->getID()));
- + setText(0,i18n("%4 - %1 %2 %3 ch",_stream->getlanguage(),_stream->getformat(),_stream->getchannels(),_stream->getID()));
- setIcon(0,SmallIcon("sound")) ;
- //setText(1,i18n("%1 MB",_stream->getsize_mb()));
- }
- @@ -65,7 +65,7 @@
- showDefault(false);
- setFlags(Qt::ItemIsEnabled | Qt::ItemIsUserCheckable | Qt::ItemIsSelectable);
- setCheckState(0,_stream->getselected()?Qt::Checked:Qt::Unchecked);
- - setText(0,i18n("%3 - %1 %2").arg(_stream->getlanguage()).arg(_stream->getcontent()).arg(_stream->getID().first()));
- + setText(0,i18n("%3 - %1 %2",_stream->getlanguage(),_stream->getcontent(),_stream->getID().first()));
- setIcon(0,SmallIcon("subtitle"));
-
- //setText(1,i18n("%1 MB",_stream->getsize_mb()));
- diff -Naur k9copy-work/src/assistant/k9asttitles.cpp k9copy/src/assistant/k9asttitles.cpp
- --- k9copy-work/src/assistant/k9asttitles.cpp 2014-09-29 11:00:12.000000000 -0400
- +++ k9copy/src/assistant/k9asttitles.cpp 2020-12-23 23:48:01.704471948 -0500
- @@ -276,22 +276,22 @@
- int ch=0;
- for (int i=0;i< _title->getchapterCount();i++) {
- _k9ItemWidget *it =new _k9ItemWidget(_title->getChapter(i),_parent,k9astTitles::CHAPTER);
- - it->setText(1,i18n("chapter %1").arg(++ch));
- + it->setText(1,i18n("chapter %1",++ch));
- QString s;
-
- s=QString("%1").arg((double)(_title->getChapter(i)->getsectors()) /512,0,'f',2);
- it->setText(2,QString("%1").arg(_title->getChapter(i)->getLength().toString("hh:mm:ss")));
- - it->setText(3,i18n("%1 MB").arg(s));
- + it->setText(3,i18n("%1 MB",s));
- }
- for (int j=0;j <_title->getTitles().count();j++) {
- k9DVDTitle *title2=_title->getTitles().at(j);
- for (int i=0;i< title2->getchapterCount();i++) {
- _k9ItemWidget *it =new _k9ItemWidget(title2->getChapter(i),_parent,k9astTitles::CHAPTER);
- - it->setText(1,i18n("chapter %1").arg(++ch));
- + it->setText(1,i18n("chapter %1",++ch));
- QString s;
- s=QString("%1").arg((double)(title2->getChapter(i)->getsectors()) /512,0,'f',2);
- it->setText(2,QString("%1").arg(title2->getChapter(i)->getLength().toString("hh:mm:ss")));
- - it->setText(3,i18n("%1 MB").arg(s));
- + it->setText(3,i18n("%1 MB",s));
- }
-
- }
- diff -Naur k9copy-work/src/backup/k9dvdauthor.cpp k9copy/src/backup/k9dvdauthor.cpp
- --- k9copy-work/src/backup/k9dvdauthor.cpp 2014-09-29 11:00:12.000000000 -0400
- +++ k9copy/src/backup/k9dvdauthor.cpp 2020-12-23 23:48:01.704471948 -0500
- @@ -161,7 +161,7 @@
- error=true;
- QString sMsg;
- //sMsg.QString::sprintf(tr2i18n("'%s' not selected"),l_track->getname().latin1());
- - sMsg=i18n("'%1' not selected").arg(l_track->getname());
- + sMsg=i18n("'%1' not selected",l_track->getname());
- k9Dialogs::error( sMsg, i18n("authoring"));
- }
- start.sprintf("jump titleset %d menu;",DVD->getnewTitleNum(l_track));
- @@ -415,7 +415,7 @@
- c.sprintf("g1=%d;\ncall vmgm menu;",DVD->getnewTitleNum(l_next));
- if ( DVD->getnewTitleNum(l_next)==-1) {
- error=true;
- - c=i18n("'%1' not selected").arg(l_next->getname());
- + c=i18n("'%1' not selected",l_next->getname());
- k9Dialogs::error( c, i18n("authoring"));
- }
-
- @@ -439,7 +439,7 @@
- void k9DVDAuthor::author() {
- k9Config config;
- if ( ! k9Tools::checkProgram("dvdauthor")) {
- - k9Dialogs::error (i18n("Unable to run %1").arg("dvdauthor") , i18n("authoring"));
- + k9Dialogs::error (i18n("Unable to run %1","dvdauthor") , i18n("authoring"));
- error = TRUE;
- return;
- }
- diff -Naur k9copy-work/src/backup/k9dvdbackup.cpp k9copy/src/backup/k9dvdbackup.cpp
- --- k9copy-work/src/backup/k9dvdbackup.cpp 2020-12-23 23:47:42.374321418 -0500
- +++ k9copy/src/backup/k9dvdbackup.cpp 2020-12-23 23:48:01.705471956 -0500
- @@ -295,13 +295,13 @@
- k9DVDFile *dvdfile;
- if ((dvdfile = m_dvdread->openTitle( _vts))== 0) {
- QString stmp;
- - stmp=i18n("Unable to open titleset %1").arg(_vts);
- + stmp=i18n("Unable to open titleset %1",_vts);
- seterror(stmp);
- return ;
- }
- setTotalSteps(vts_handle->vtsi_mat->vts_last_sector-vts_handle->vtsi_mat->vtstt_vobs -1);
- QString c;
- - c=i18n("Extracting titleset %1").arg(_vts);
- + c=i18n("Extracting titleset %1",_vts);
- setProgressLabel(c);
- if (!k9Tools::getBatchCopy())
- backupDlg->show();
- @@ -477,7 +477,7 @@
- k9DVDFile *dvdfile;
- if ((dvdfile = m_dvdread->openMenu( _vts))== 0) {
- QString stmp;
- - stmp=i18n("Unable to open menu for titleset %1").arg(_vts);
- + stmp=i18n("Unable to open menu for titleset %1",_vts);
- seterror (stmp);
- return 0;
- }
- @@ -503,7 +503,7 @@
- uint32_t sector, dsi_next_vobu = 0;
- uint32_t imax=length/sizeof(cell_adr_t);
- QString c;
- - c=i18n("Extracting menu for titleset %1").arg(_vts);
- + c=i18n("Extracting menu for titleset %1",_vts);
- setProgressLabel(c);
- if (!k9Tools::getBatchCopy()) {
- backupDlg->show();
- @@ -597,7 +597,7 @@
- vts_handle=currTS->ifoTitle->getIFO();
- if (!vts_handle) {
- QString stmp;
- - stmp=i18n("Unable to open ifo file for titleset %1").arg(vts_num);
- + stmp=i18n("Unable to open ifo file for titleset %1",vts_num);
- seterror (stmp);
- //JMP vamps->setNoData();
- return;
- @@ -605,7 +605,7 @@
-
- setTotalSteps( vts_handle->vtsi_mat->vts_last_sector-vts_handle->vtsi_mat->vtstt_vobs -1);
- QString c;
- - c=i18n("Extracting titleset %1").arg(vts_num);
- + c=i18n("Extracting titleset %1",vts_num);
- setProgressLabel(c);
- if (!k9Tools::getBatchCopy())
- backupDlg->show();
- @@ -620,7 +620,7 @@
- dvdfile = m_dvdread->openTitle (vts_num);
- if (! dvdfile) {
- QString stmp;
- - stmp=i18n("Unable to open vobs for titleset %1").arg(vts_num);
- + stmp=i18n("Unable to open vobs for titleset %1",vts_num);
- seterror( stmp);
- //JMP vamps->setNoData();
- return;
- @@ -1450,7 +1450,7 @@
- sName="VIDEO_TS.VOB";
- else
- sName.sprintf("VTS_%02d_%d.VOB",(int)currVTS,(int)VobNum);
- - dbg=i18n("Updating vob %1").arg(sName);
- + dbg=i18n("Updating vob %1",sName);
- sName=output+"/"+sName;
- QFileInfo finfo(sName);
- long fileSize=finfo.size();
- diff -Naur k9copy-work/src/backup/k9execcopy.cpp k9copy/src/backup/k9execcopy.cpp
- --- k9copy-work/src/backup/k9execcopy.cpp 2020-12-23 23:47:42.374321418 -0500
- +++ k9copy/src/backup/k9execcopy.cpp 2020-12-23 23:48:01.705471956 -0500
- @@ -39,7 +39,7 @@
- m_cancelled=false;
- QString filename;
- if (!m_dvd->getopened()) {
- - k9Dialogs::error( i18n("DVD is not opened"), i18n("DVD Copy"));
- + k9Dialogs::error( i18n("DVD is not opened"),i18n("DVD Copy"));
- return;
- }
-
- @@ -70,7 +70,7 @@
- long fs=k9Tools::getFreeSpace(outputDir);
- int maxSize=config.getPrefSize() < (m_dvd->getsizeSelected(false)/512) ? config.getPrefSize():(m_dvd->getsizeSelected(false)/512);
- if ((fs < maxSize) && (fs !=-1)) {
- - if (k9Dialogs::warningContinueCancel ( i18n("Insufficient disk space on %1\n%2 MB expected.").arg(outputDir).arg(config.getPrefSize()),i18n("DVD Copy"))==cancel)
- + if (k9Dialogs::warningContinueCancel ( i18n("Insufficient disk space on %1\n%2 MB expected.",outputDir,config.getPrefSize()),i18n("DVD Copy"))==cancel)
- return;
- }
-
- @@ -188,7 +188,7 @@
-
- if (matroska) {
- if ( ! k9Tools::checkProgram("mkvmerge") ) {
- - k9Dialogs::error (i18n("Unable to run %1").arg("mkvmerge") , i18n("Encoding error"));
- + k9Dialogs::error (i18n("Unable to run %1","mkvmerge") , i18n("Encoding error"));
- delete mp4;
- return ;
- }
- diff -Naur k9copy-work/src/backup/k9mp4enc.cpp k9copy/src/backup/k9mp4enc.cpp
- --- k9copy-work/src/backup/k9mp4enc.cpp 2014-09-29 11:00:12.000000000 -0400
- +++ k9copy/src/backup/k9mp4enc.cpp 2020-12-23 23:48:01.706471964 -0500
- @@ -157,8 +157,8 @@
-
- if (!m_extractAudio) {
- if ( ! k9Tools::checkProgram(sCodecV) ) {
- - k9log::add(i18n("Unable to run %1").arg(sCodecV),k9logLevel::ERROR);
- - k9Dialogs::error (i18n("Unable to run %1").arg(sCodecV) , i18n("Encoding error"));
- + k9log::add(i18n("Unable to run %1",sCodecV),k9logLevel::ERROR);
- + k9Dialogs::error (i18n("Unable to run %1",sCodecV) , i18n("Encoding error"));
- m_error = TRUE;
- return false;
- }
- @@ -168,8 +168,8 @@
-
- if ((sCodecA!=sCodecV) || m_extractAudio) {
- if ( ! k9Tools::checkProgram(sCodecA) ) {
- - k9log::add(i18n("Unable to run %1").arg(sCodecV),k9logLevel::ERROR);
- - k9Dialogs::error (i18n("Unable to run %1").arg(sCodecA) , i18n("Encoding error"));
- + k9log::add(i18n("Unable to run %1",sCodecV),k9logLevel::ERROR);
- + k9Dialogs::error (i18n("Unable to run %1",sCodecA) , i18n("Encoding error"));
- m_error = TRUE;
- return false;
- }
- @@ -181,12 +181,12 @@
-
- void k9MP4Enc::execute(k9DVDTitle *_title) {
- if (m_mpeg2)
- - k9log::add(i18n("Starting extraction of %1, chapters %2").arg(_title->getname()).arg(getChapterList( _title)),k9logLevel::INFO);
- + k9log::add(i18n("Starting extraction of %1, chapters %2",_title->getname(),getChapterList( _title)),k9logLevel::INFO);
- else
- - k9log::add(i18n("Starting encoding of %1, chapters %2").arg(_title->getname()).arg(getChapterList( _title)),k9logLevel::INFO);
- - k9log::add(i18n("source : %1").arg(m_device),k9logLevel::INFO);
- - k9log::add(i18n("destination : %1").arg(m_filename),k9logLevel::INFO);
- - k9log::add(i18n("disk cache : %1").arg( m_usecache ? i18n("activated"):i18n("disabled")),k9logLevel::INFO);
- + k9log::add(i18n("Starting encoding of %1, chapters %2",_title->getname(),getChapterList( _title)),k9logLevel::INFO);
- + k9log::add(i18n("source : %1",m_device),k9logLevel::INFO);
- + k9log::add(i18n("destination : %1",m_filename),k9logLevel::INFO);
- + k9log::add(i18n("disk cache : %1", m_usecache ? i18n("activated"):i18n("disabled")),k9logLevel::INFO);
- m_currentChapter=0;
- m_error=false;
- m_outputFile=NULL;
- @@ -205,14 +205,14 @@
- m_remain="--:--:--";
-
- m_totalSize=_title->getChaptersSize(true);
- - k9log::add(i18n("size : %1 MB").arg(m_totalSize/512),k9logLevel::INFO);
- + k9log::add(i18n("size : %1 MB",m_totalSize/512),k9logLevel::INFO);
- if (!m_mpeg2) {
- - k9log::add(i18n("audio bitrate : %1").arg(m_audioBitrate),k9logLevel::INFO);
- + k9log::add(i18n("audio bitrate : %1",m_audioBitrate),k9logLevel::INFO);
- if (!m_extractAudio) {
- if (m_videoBitrate !="")
- - k9log::add(i18n("user defined video bitrate : %1").arg(m_videoBitrate),k9logLevel::INFO);
- + k9log::add(i18n("user defined video bitrate : %1",m_videoBitrate),k9logLevel::INFO);
- else
- - k9log::add(i18n("calculated video bitrate : %1").arg(getBitRate(_title)),k9logLevel::INFO);
- + k9log::add(i18n("calculated video bitrate : %1",getBitRate(_title)),k9logLevel::INFO);
- }
- }
- QString injectName;
- @@ -239,7 +239,7 @@
-
- do {
- if (!m_mpeg2)
- - k9log::add(i18n("starting pass %1 of %2").arg(pass==0 ? 1:pass).arg(maxPass==0 ? 1 : maxPass),k9logLevel::INFO);
- + k9log::add(i18n("starting pass %1 of %2",pass==0 ? 1:pass,maxPass==0 ? 1 : maxPass),k9logLevel::INFO);
- m_totalBytes=0;
- m_vamps=new k9vamps(this,m_usecache);;
- m_player=new k9play(this);
- @@ -507,7 +507,7 @@
-
- QString sAOption=replaceParams(audioCodecs->getOptions(m_audioCodec)).trimmed();
-
- - m_progress->setTitleLabel(i18n("Encoding %1").arg(sCodec));
- + m_progress->setTitleLabel(i18n("Encoding %1",sCodec));
- QString path,ext=audioCodecs->getExtension(m_audioCodec) ;
- if (!ext.startsWith("."))
- ext="."+ext;
- @@ -519,7 +519,7 @@
-
- cmd << m_ffmpegPath << "-i" << "/dev/stdin" <<sAOption.split(" ") << KShell::quoteArg(path) ;
-
- - k9log::add(i18n("starting thread : %1").arg(cmd.join(" ")),k9logLevel::INFO);
- + k9log::add(i18n("starting thread : %1",cmd.join(" ")),k9logLevel::INFO);
- k9ConvertAudio *converter=new k9ConvertAudio("",cmd);
- m_converters[BASE_CONV_AUDIO+i]=converter;
- m_convertersToDelete << converter;
- @@ -571,9 +571,9 @@
- cmd << sVOption.split(" ");
-
- if (pass >0)
- - m_progress->setTitleLabel(i18n("Encoding %1").arg(sCodec)+" - "+i18n("pass %1").arg(pass));
- + m_progress->setTitleLabel(i18n("Encoding %1",sCodec)+" - "+i18n("pass %1",pass));
- else
- - m_progress->setTitleLabel(i18n("Encoding %1").arg(sCodec));
- + m_progress->setTitleLabel(i18n("Encoding %1",sCodec));
-
- if (m_fourcc !="")
- cmd << "-vtag" << m_fourcc;
- @@ -640,7 +640,7 @@
- cmd << "-y" << KShell::quoteArg(path);
- cmd << slNewAudio;
- // if (m_extractMkv) {
- - k9log::add(i18n("starting thread : %1").arg(cmd.join(" ")),k9logLevel::INFO);
- + k9log::add(i18n("starting thread : %1",cmd.join(" ")),k9logLevel::INFO);
- k9ConvertAudio *converter=new k9ConvertAudio("",cmd);
- //converter->setDebug(true);
- m_converters[BASE_CONV_VIDEO]=converter;
- @@ -690,9 +690,9 @@
-
-
- if (pass >0)
- - m_progress->setTitleLabel(i18n("Encoding %1").arg(sCodec)+" - "+i18n("pass %1").arg(pass));
- + m_progress->setTitleLabel(i18n("Encoding %1",sCodec)+" - "+i18n("pass %1",pass));
- else
- - m_progress->setTitleLabel(i18n("Encoding %1").arg(sCodec));
- + m_progress->setTitleLabel(i18n("Encoding %1",sCodec));
-
- if (m_fourcc !="")
- cmd << "-ffourcc" << m_fourcc;
- @@ -747,7 +747,7 @@
- // cmd << "-of" << "lavf";
- // cmd << "-lavfopts" << "i_certify_that_my_video_stream_does_not_use_b_frames";
- }
- - k9log::add(i18n("starting thread : %1").arg(cmd.join(" ")),k9logLevel::INFO);
- + k9log::add(i18n("starting thread : %1",cmd.join(" ")),k9logLevel::INFO);
- k9ConvertAudio *converter=new k9ConvertAudio("",cmd);
- converter->setDebug(false);
- m_converters[BASE_CONV_VIDEO]=converter;
- @@ -894,7 +894,7 @@
- else {
- m_player->setAborted(true);
- m_error=true;
- - m_msgError=i18n("An error occured while encoding the %1 stream").arg(i18n("audio"));
- + m_msgError=i18n("An error occured while encoding the %1 stream",i18n("audio"));
- m_ErrorDetail=c->getOutput();
- k9log::add(m_msgError,k9logLevel::ERROR);
- }
- @@ -919,7 +919,7 @@
- else {
- m_player->setAborted(true);
- m_error=true;
- - m_msgError=i18n("An error occured while encoding the %1 stream").arg(i18n("video"));
- + m_msgError=i18n("An error occured while encoding the %1 stream",i18n("video"));
- m_ErrorDetail=c->getOutput();
- k9log::add(m_msgError,k9logLevel::ERROR);
- }
- diff -Naur k9copy-work/src/core/k9burndvd.cpp k9copy/src/core/k9burndvd.cpp
- --- k9copy-work/src/core/k9burndvd.cpp 2014-09-29 11:00:12.000000000 -0400
- +++ k9copy/src/core/k9burndvd.cpp 2020-12-23 23:48:01.706471964 -0500
- @@ -148,7 +148,7 @@
- proc2->sync();
- if (proc2->exitStatus()==0) {
- delete proc2;
- - k9log::add(i18n("image size : %1").arg(imageSize),k9logLevel::INFO);
- + k9log::add(i18n("image size : %1",imageSize),k9logLevel::INFO);
- return imageSize;
- }
- }
- @@ -234,7 +234,7 @@
- connect( proc2, SIGNAL(receivedStdout(char *, int)),this, SLOT(mkisoSizeStdout(char *, int)) );
- k9log::add(i18n("computing image size"),k9logLevel::INFO);
- proc2->setShellCommand(proc2Cmd.join(" "));;
- - k9log::add(i18n("starting thread : %1").arg(proc2Cmd.join(" ")),k9logLevel::INFO);
- + k9log::add(i18n("starting thread : %1",proc2Cmd.join(" ")),k9logLevel::INFO);
- proc2->start();
- proc2->sync();
- getWodimCmd(procCmd);
- @@ -243,7 +243,7 @@
-
- if (!autoBurn) {
- #if QT_VERSION >= 0x050000
- - if ( k9Dialogs::warningContinueCancel ( i18n("Insert a recordable DVD"), i18n("DVD burning"))!=QMessageBox::Ignore)
- + if ( k9Dialogs::warningContinueCancel ( i18n("Insert a recordable DVD"),i18n("DVD burning"))!=QMessageBox::Ignore)
- #else
- if ( k9Dialogs::warningContinueCancel ( i18n("Insert a recordable DVD"), i18n("DVD burning"))!=KMessageBox::Continue)
- #endif
- @@ -255,12 +255,12 @@
-
- if (!cancelled) {
- k9log::add(i18n("start burning"),k9logLevel::INFO);
- - k9log::add(i18n("starting thread : %1").arg(procCmd.join(" ")),k9logLevel::INFO);
- + k9log::add(i18n("starting thread : %1",procCmd.join(" ")),k9logLevel::INFO);
-
- int res=progress->execute();
- if ( res==-1 ) {
- k9log::add(i18n("Error"),k9logLevel::ERROR);
- - k9Dialogs::error( i18n("Error burning DVD :\n")+i18n("Unable to run %1").arg("genisoimage"), i18n("DVD burning") );
- + k9Dialogs::error( i18n("Error burning DVD :\n")+i18n("Unable to run %1", "genisoimage"),i18n("DVD burning") );
- cancelled=true;
- } else {
-
- @@ -353,13 +353,13 @@
- }
- if (!cancelled) {
- k9log::add(i18n("start burning"),k9logLevel::INFO);
- - k9log::add(i18n("starting thread : %1").arg(proc->debug()),k9logLevel::INFO);
- + k9log::add(i18n("starting thread : %1",proc->debug()),k9logLevel::INFO);
-
- int res=progress->execute();
- if ( res==-1 ) {
- k9log::add(i18n("Error"),k9logLevel::ERROR);
-
- - k9Dialogs::error( i18n("Error burning DVD :\n")+i18n("Unable to run %1").arg(progname), i18n("DVD burning") );
- + k9Dialogs::error( i18n("Error burning DVD :\n")+i18n("Unable to run %1",progname), i18n("DVD burning") );
- cancelled=true;
- } else {
-
- @@ -413,7 +413,7 @@
- }
-
- progress->setTitle(i18n("Burning DVD"));
- - progress->setLabelText(i18n("Current write speed :%1 x").arg(burnSpeed));
- + progress->setLabelText(i18n("Current write speed :%1 x",burnSpeed));
- if (c.contains("% done")) {
- pos=c.indexOf("%");
- if (pos!=-1) {
- @@ -433,7 +433,7 @@
- }
- }
- }
- - else k9log::add(i18n("%1").arg(c),k9logLevel::INFO);
- + else k9log::add(i18n("%1",c),k9logLevel::INFO);
- }
- }
- void k9BurnDVD::growisoStdout(char *buffer, int buflen) {
- diff -Naur k9copy-work/src/core/k9dvd.cpp k9copy/src/core/k9dvd.cpp
- --- k9copy-work/src/core/k9dvd.cpp 2014-09-29 11:00:12.000000000 -0400
- +++ k9copy/src/core/k9dvd.cpp 2020-12-23 23:48:01.707471971 -0500
- @@ -214,7 +214,7 @@
- int i;
- QString c;
- if (! (filehandle = fopen(dvd_device, "r"))) {
- - c=i18n("Couldn't open %1 for title\n").arg(dvd_device);
- + c=i18n("Couldn't open %1 for title\n",dvd_device);
- // setError(c );
- strcpy(title, i18n("unknown").toUtf8());
- return -1;
- @@ -222,7 +222,7 @@
-
- if ( fseek(filehandle, 32808, SEEK_SET )) {
- fclose(filehandle);
- - c=i18n("Couldn't seek in %1 for title\n").arg(dvd_device);
- + c=i18n("Couldn't seek in %1 for title\n",dvd_device);
- setError(c);
- strcpy(title, i18n("unknown").toUtf8());
- return -1;
- @@ -377,7 +377,7 @@
- m_dvd.close();
- m_dvd.openDevice(device);
- if ( !m_dvd.opened() ) {
- - c=i18n("Can't open disc %1!\n").arg(device);
- + c=i18n("Can't open disc %1!\n",device);
- setError(c);
- return 2;
- }
- @@ -411,7 +411,7 @@
- ifo = kifo->getIFO();
- if (ifo==NULL) {
- //ifo is null when trying to open a protected dvd
- - setError(i18n("Can't open disc %1!\n").arg(device));
- + setError(i18n("Can't open disc %1!\n",device));
- return 2;
- //continue;
- }
- @@ -435,7 +435,7 @@
- vts_ttn = ttn;//ifo->vts_ptt_srpt->title[j].ptt[0].pgcn; //ifo_zero->tt_srpt->title[j].vts_ttn;
-
- //JMPtxt=i18n("Title %1").arg(indexedCount);
- - txt=i18n("Title %1").arg(numTitle);
- + txt=i18n("Title %1",numTitle);
- emit sigTotalText (txt);
- emit sigTitleProgress(numTitle,ltitles);
- video_attr = &vtsi_mat->vts_video_attr;
- @@ -725,7 +725,7 @@
- }
- if (bappend)
- m_titles.append(track);
- - track->name=i18n("Title %1").arg(num);
- + track->name=i18n("Title %1",num);
-
- if (!_indexed) {
- for (int i=0;i<m_titles.count();i++) {
- @@ -895,7 +895,7 @@
- QString c;
- dvdfile =m_dvd.openTitle( title);
- if ( !dvdfile ) {
- - c=i18n("Error opening vobs for title %1\n").arg(title);
- + c=i18n("Error opening vobs for title %1\n",title);
- setError(c);
- return 0;
- }
- @@ -906,7 +906,7 @@
- emit sigVobProgress(i-startblock,lastblock-startblock);
- total+=size;
- if ( !size ) {
- - c=i18n("ERROR reading block %1\n").arg(i);
- + c=i18n("ERROR reading block %1\n",i);
- setError(c);
- break;
- }
- diff -Naur k9copy-work/src/import/k9avidecode.cpp k9copy/src/import/k9avidecode.cpp
- --- k9copy-work/src/import/k9avidecode.cpp 2014-09-29 11:00:12.000000000 -0400
- +++ k9copy/src/import/k9avidecode.cpp 2020-12-23 23:48:01.707471971 -0500
- @@ -53,20 +53,20 @@
- m_error="";
- QStringList errs;
- if (!CodecHandle) {
- - errs << i18n("Cannot open the library %1").arg("libavcodec");
- + errs << i18n("Cannot open the library %1","libavcodec");
- }
- if (!FormatHandle ) {
- - errs << i18n("Cannot open the library %1").arg("libavformat");
- + errs << i18n("Cannot open the library %1","libavformat");
- }
- # if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 33, 0)
- if (!UtilHandle) {
- - m_error =i18n("Cannot open then library %1").arg("libavutil");
- + m_error =i18n("Cannot open then library %1","libavutil");
- return;
- }
- # endif
- #ifdef HAVE_SWSCALE
- if (!SwscaleHandle) {
- - errs << i18n("Cannot open the library %1").arg("libswscale");
- + errs << i18n("Cannot open the library %1","libswscale");
- }
- #endif
-
- @@ -101,7 +101,7 @@
- img_convert = (img_convert_t)dlsym(CodecHandle,"img_convert");
- //if img_convert is null (deprecated in ffmpeg), we need libswscale
- if (!img_convert)
- - errs << i18n("Cannot open the library %1").arg("libswscale");
- + errs << i18n("Cannot open the library %1","libswscale");
- #endif
- av_free = (av_free_t)dlsym(CodecHandle,"av_free");
- av_free_packet = (av_free_packet_t)dlsym(CodecHandle,"av_free_packet");
- @@ -174,7 +174,7 @@
- av_open_input_file(&m_FormatCtx, _fileName.toUtf8(), NULL, 0, NULL)!=0
- # endif
- ) {
- - m_error=i18n("Couldn't open the file %1").arg(_fileName);
- + m_error=i18n("Couldn't open the file %1",_fileName);
- return false; // Couldn't open file}
- }
- // Retrieve stream information
- @@ -231,7 +231,7 @@
- // Allocate an AVFrame structure
- m_FrameRGB=avcodec_alloc_frame();
- if (m_FrameRGB==NULL) {
- - m_error =i18n ("Unable to allocate memory for frames");
- + m_error =i18n("Unable to allocate memory for frames");
- return false;
- }
-
- diff -Naur k9copy-work/src/import/k9import.cpp k9copy/src/import/k9import.cpp
- --- k9copy-work/src/import/k9import.cpp 2014-09-29 11:00:12.000000000 -0400
- +++ k9copy/src/import/k9import.cpp 2020-12-23 23:48:01.707471971 -0500
- @@ -186,7 +186,7 @@
-
-
- k9LvItemImport * itemch=new k9LvItemImport(title,k9LvItemImport::CHAPTER);
- - itemch->setText(0,i18n("chapter %1").arg(title->childCount()));
- + itemch->setText(0,i18n("chapter %1",title->childCount()));
- itemch->setAviFile(file);
- itemch->setTitle(title->getTitle());
- connect(file,SIGNAL(aviFileUpdated(k9AviFile*)),this,SLOT(aviFileUpdated(k9AviFile*)));
- @@ -201,7 +201,7 @@
- btn->setHeight(config.getPrefButtonHeight());
- btn->setScript(QString("jump title 1 chapter %1 ;").arg(title->childCount()));
- btn->setTextPosition(BOTTOM);
- - btn->setText(i18n("chapter %1").arg(title->childCount()));
- + btn->setText(i18n("chapter %1",title->childCount()));
- btn->setColor(config.getPrefButtonTextColor());
- btn->setFont(config.getPrefButtonFont());
- file->setButton(btn);
- diff -Naur k9copy-work/src/import/k9menu.cpp k9copy/src/import/k9menu.cpp
- --- k9copy-work/src/import/k9menu.cpp 2014-09-29 11:00:12.000000000 -0400
- +++ k9copy/src/import/k9menu.cpp 2020-12-23 23:48:01.707471971 -0500
- @@ -145,7 +145,7 @@
- void k9Menu::createAudio(const QString & _audioFile) {
- if (! (k9Tools::checkProgram("twolame",false) || k9Tools::checkProgram("toolame",false))) {
- m_error=true;
- - k9Dialogs::error(i18n("Error starting program %1").arg("twolame | toolame"),i18n("Running program"));
- + k9Dialogs::error(i18n("Error starting program %1","twolame | toolame"),i18n("Running program"));
- return;
- }
-
- diff -Naur k9copy-work/src/import/k9menuedit.cpp k9copy/src/import/k9menuedit.cpp
- --- k9copy-work/src/import/k9menuedit.cpp 2014-09-29 11:00:12.000000000 -0400
- +++ k9copy/src/import/k9menuedit.cpp 2020-12-23 23:48:01.708471979 -0500
- @@ -298,7 +298,7 @@
- disconnect (this,SIGNAL(endScriptChanged(const QString&)),0,0);
- Ui_menuEdit.cbEnd->setEnabled(true);
- m_scene->clearSelection();;
- - Ui_menuEdit.lTitle->setText(i18n("Title %1 Menu").arg(_title->getNum()+1));
- + Ui_menuEdit.lTitle->setText(i18n("Title %1 Menu",_title->getNum()+1));
- setScene(_title->getMenu()->getScene());
- m_menuType=TITLEMENU;
- Ui_menuEdit.cbStart->clear();
- @@ -322,7 +322,7 @@
- k9NewDVD *newDVD=(k9NewDVD*)_title->parent() ;
- k9NewDVDItems *items=newDVD->getTitles();
- foreach (k9Title *title,*items) {
- - Ui_menuEdit.cbEnd->addItem(i18n("Play Title %1").arg(title->getNum()+1));
- + Ui_menuEdit.cbEnd->addItem(i18n("Play Title %1",title->getNum()+1));
- QString script=QString("g6=%1; call vmgm menu;" ).arg(title->getNum()+1);
- m_endScripts << script;
- }
- @@ -348,7 +348,7 @@
- m_startScripts << "";
- k9NewDVDItems *items=_newDVD->getTitles();
- foreach (k9Title *title,*items) {
- - Ui_menuEdit.cbStart->addItem(i18n("Play Title %1").arg(title->getNum()+1));
- + Ui_menuEdit.cbStart->addItem(i18n("Play Title %1",title->getNum()+1));
- // QString script=QString("if (g5==0) {g5=1; jump title %1;}" ).arg(title->getNum()+1);
- QString script=QString("g6=%1;" ).arg(title->getNum()+1);
- m_startScripts << script;
- diff -Naur k9copy-work/src/import/k9newdvd.cpp k9copy/src/import/k9newdvd.cpp
- --- k9copy-work/src/import/k9newdvd.cpp 2020-12-23 23:47:42.375321426 -0500
- +++ k9copy/src/import/k9newdvd.cpp 2020-12-23 23:48:01.708471979 -0500
- @@ -175,7 +175,7 @@
- QString menuFileName=m_workDir+k9Tools::randomFileName()+".mpg";
- m_tmpFiles << menuFileName,
- menu->setMenuFileName(menuFileName);
- - m_processList->addProgress(i18n("Creating menu for title %1").arg(title->getNum()+1));
- + m_processList->addProgress(i18n("Creating menu for title %1",title->getNum()+1));
- if (!menu->createMenus(&titleSet))
- return;
-
- @@ -282,7 +282,7 @@
- break;
- }
-
- - k9Process *process=m_processList->addProcess(i18n("Encoding %1").arg(_aviFile->getFileName()));
- + k9Process *process=m_processList->addProcess(i18n("Encoding %1",_aviFile->getFileName()));
- m_processList->setFileName(process,_aviFile->getFileName());
-
- QTime t(0,0);
- @@ -499,7 +499,7 @@
- btn->setHeight(m_config->getPrefButtonHeight());
- btn->setScript(QString("g1=0;jump titleset %1 menu;").arg(_title->getNum()+1));
- btn->setTextPosition(RIGHT);
- - btn->setText(i18n("title %1").arg(_title->getNum()+1));
- + btn->setText(i18n("title %1",_title->getNum()+1));
- btn->setColor(m_config->getPrefButtonTextColor());
- btn->setFont(m_config->getPrefButtonFont());
-
- diff -Naur k9copy-work/src/import/k9newtitle.cpp k9copy/src/import/k9newtitle.cpp
- --- k9copy-work/src/import/k9newtitle.cpp 2014-09-29 11:00:12.000000000 -0400
- +++ k9copy/src/import/k9newtitle.cpp 2020-12-23 23:48:01.708471979 -0500
- @@ -126,7 +126,7 @@
- k9LvItemImport *item=new k9LvItemImport(m_k9Import->getRoot(),k9LvItemImport::TITLE);
- item->setExpanded(true);
- k9Title *title=new k9Title( m_k9Import->getNewDVD());
- - item->setText(0,i18n("title %1").arg(title->getNum() +1));
- + item->setText(0,i18n("title %1",title->getNum() +1));
-
- connect( title->getButton(),SIGNAL(sigsetImage(k9MenuButton*, const QImage&)),m_k9Import,SLOT(buttonUpdated(k9MenuButton*, const QImage&)));
- item->setTitle(title);
- @@ -180,7 +180,7 @@
- file->setEnd(t.addMSecs(qMin(pos,fileInfo.getDuration()) *1000));
- file->setReencode(!Ui_newTitle.ckReencode->isChecked());
- k9LvItemImport * itemch=new k9LvItemImport(item,k9LvItemImport::CHAPTER);
- - itemch->setText(0,i18n("chapter %1").arg(i+1));
- + itemch->setText(0,i18n("chapter %1",i+1));
- itemch->setText(1,file->getStart().toString("hh:mm:ss") +" - "+file->getEnd().toString("hh:mm:ss") );
- itemch->setAviFile(file);
- itemch->setTitle(title);
- @@ -202,7 +202,7 @@
- btn->setHeight(height);
- btn->setScript(QString("jump title 1 chapter %1 ;").arg(i+1));
- btn->setTextPosition(BOTTOM);
- - btn->setText(i18n("chapter %1").arg(i+1));
- + btn->setText(i18n("chapter %1",i+1));
- btn->setColor(config.getPrefButtonTextColor());
- btn->setFont(config.getPrefButtonFont());
- file->setButton(btn);
- diff -Naur k9copy-work/src/main/k9main.cpp k9copy/src/main/k9main.cpp
- --- k9copy-work/src/main/k9main.cpp 2014-09-29 11:00:12.000000000 -0400
- +++ k9copy/src/main/k9main.cpp 2020-12-23 23:48:01.708471979 -0500
- @@ -436,7 +436,7 @@
- execCopy.copyDVD();
- break;
- }
- - changeStatusbar ( i18n ( "Ready" ) ,sbMessage );
- + changeStatusbar ( i18n( "Ready" ) ,sbMessage );
-
- }
-
- @@ -457,7 +457,7 @@
- index=i;
- }
- QString res="";
- - if ( ( index==-1 ) || ( _combo->currentText() ==i18n ( "ISO Image" ) ) ) {
- + if ( ( index==-1 ) || ( _combo->currentText() ==i18n( "ISO Image" ) ) ) {
- res=_combo->currentText();
- } else {
- k9CdDrive * drive= ( k9CdDrive* ) driveList.at ( index );
- @@ -512,12 +512,12 @@
-
- dvd->scandvd ( sDevice,m_quickScan );
- if ( dvd->geterror() ) {
- - k9Dialogs::error ( dvd->geterrMsg(), i18n ( "Open DVD" ) );
- + k9Dialogs::error ( dvd->geterrMsg(), i18n( "Open DVD" ) );
- return;
- }
-
- m_parent->setDvdOpened(true);
- - if ( dvd->getDVDTitle() ==i18n ( "unknown" ) && sVolName!="" ) {
- + if ( dvd->getDVDTitle() ==i18n( "unknown" ) && sVolName!="" ) {
- dvd->setDVDTitle ( sVolName );
- }
-
- @@ -535,14 +535,14 @@
- ckLvItem *tsItem = new ckLvItem ( root,this,TITLESET );
- tsItem->setExpanded ( TRUE );
- QString c;
- - c=i18n ( "Titleset %1").arg(i+1 );
- + c=i18n( "Titleset %1",i+1 );
- tsItem->setText ( 0,c );
- QFont font=tsItem->font ( 1 );
- font.setWeight ( QFont::Bold );
- tsItem->setFont ( 1,font );
-
-
- - tsItem->setText ( 1," "+dvd->gettitleset ( i )->getsize_mb() +" " +i18n ( "MB" ) );
- + tsItem->setText ( 1," "+dvd->gettitleset ( i )->getsize_mb() +" " +i18n( "MB" ) );
- tsItem->setTextAlignment ( 1,Qt::AlignRight );
- tsItem->obj=dvd->gettitleset ( i ) ;
- tsItem->streamType=NONE;
- @@ -561,7 +561,7 @@
- m_playbackOptions->fillTitleList();
- m_langSelect->fillLvLanguages();
- listView1->setSortingEnabled ( true );
- - changeStatusbar ( i18n ( "Ready" ),sbMessage );
- + changeStatusbar ( i18n( "Ready" ),sbMessage );
- emit SelectionChanged ( dvd,withMenus() );
- this->setEnabled ( true );
-
- @@ -606,18 +606,18 @@
-
- void k9Main::addChapters ( QTreeWidgetItem *_parent,k9DVDTitle *_title ) {
- LvItem *chapter = new LvItem ( _parent,CHAPTER );
- - chapter->setText ( 0, i18n ( "chapters" ) );
- + chapter->setText ( 0, i18n( "chapters" ) );
- chapter->setExpanded ( false );
- chapter->setIcon ( 0,pxChapter );
-
- int ch=0;
- for ( int i=0;i< _title->getchapterCount();i++ ) {
- ckLvItem *it =new ckLvItem ( chapter,this,CHAPTER );
- - it->setText ( 0,i18n ( "chapter %1").arg(++ch ) );
- + it->setText ( 0,i18n( "chapter %1",++ch ) );
- QString s;
-
- s=QString ( "%1" ).arg ( ( double ) ( _title->getChapter ( i )->getsectors() ) /512,0,'f',2 );
- - it->setText ( 1,i18n ( "%1 MB").arg(s ) );
- + it->setText ( 1,i18n( "%1 MB",s ) );
- it->setTextAlignment ( 1,Qt::AlignRight | Qt::AlignVCenter);
- it->setTextAlignment ( 2,Qt::AlignRight | Qt::AlignVCenter);
-
- @@ -631,13 +631,13 @@
- k9DVDTitle *title2=_title->getTitles().at ( j );
- for ( int i=0;i< title2->getchapterCount();i++ ) {
- ckLvItem *it =new ckLvItem ( chapter,this,CHAPTER );
- - it->setText ( 0,i18n ( "chapter %1").arg(++ch ) );
- + it->setText ( 0,i18n( "chapter %1",++ch ) );
- it->streamType=CHAP;
- it->obj=title2->getChapter ( i );
- QString s;
- s=QString ( "%1" ).arg ( ( double ) ( title2->getChapter ( i )->getsectors() ) /512,0,'f',2 );
-
- - it->setText ( 1,i18n ( "%1 MB").arg(s ) );
- + it->setText ( 1,i18n( "%1 MB",s ) );
- it->setTextAlignment ( 1,Qt::AlignRight | Qt::AlignVCenter );
- it->setTextAlignment ( 2,Qt::AlignRight | Qt::AlignVCenter );
-
- @@ -672,7 +672,7 @@
- itemTrack->setIcon ( col1,SmallIcon ( "title" ) );
- c.sprintf ( "%.2f ", track->gettotalsize_mb() );
-
- - itemTrack->setText ( col2,c+i18n ( "MB" ) );
- + itemTrack->setText ( col2,c+i18n( "MB" ) );
- itemTrack->setText (col4,track->gettotallength().toString ( "h:mm:ss" ));
- itemTrack->setTextAlignment ( col2,Qt::AlignRight|Qt::AlignVCenter );
- itemTrack->setTextAlignment ( col4,Qt::AlignRight|Qt::AlignVCenter );
- @@ -690,20 +690,20 @@
- video->setIcon ( 0,SmallIcon ( "video" ) );
- addListItem ( track,video,VID );
- video->setExpanded ( false );
- - c=i18n ( "video %1 ").arg(track->getformat() );
- + c=i18n( "video %1 ",track->getformat() );
- c.append ( " - " + track->getaspectRatio() );
-
- video->setText ( col1, c );
- if ( track->gettotalvideosize_mb() ) {
- c.sprintf ( "%.2f ", track->gettotalvideosize_mb() );
- - video->setText ( col2,c +i18n ( "MB" ) );
- + video->setText ( col2,c +i18n( "MB" ) );
- video->setTextAlignment ( col2,Qt::AlignRight );
- }
- video->obj=track;
-
- for ( i=0;i< track->getaudioStreamCount();i++ ) {
- l_auds=track->getaudioStream ( i );
- - c=i18n ( "audio %1 ").arg(i+1 );
- + c=i18n( "audio %1 ",i+1 );
- c.append ( l_auds->getlanguage() + " " +l_auds->getformat() +" " );
- ch.sprintf ( "%dch ",l_auds->getchannels() );
- c.append ( ch+l_auds->getfrequency() +" "+l_auds->getquantization() );
- @@ -717,7 +717,7 @@
- item->setText ( col1, c );
- if ( l_auds->getsize_mb() ) {
- c.sprintf ( "%.2f ", l_auds->getsize_mb());
- - item->setText ( col2,c +i18n ( "MB" ) );
- + item->setText ( col2,c +i18n( "MB" ) );
- item->setTextAlignment ( col2,Qt::AlignRight );
- }
- item->setText ( col3,l_auds->getcontent() );
- @@ -727,7 +727,7 @@
- }
- for ( i=0;i< track->getsubPictureCount();i++ ) {
- l_sub=track->getsubtitle ( i );
- - c=i18n ( "subpicture %1 ").arg(i+1 );
- + c=i18n( "subpicture %1 ",i+1 );
- c.append ( l_sub->getlanguage() );
- ckLvItem * item = new ckLvItem ( itemTrack,this,STREAM );
-
- @@ -738,7 +738,7 @@
- item->setText ( col1, c );
- if ( l_sub->getsize_mb() ) {
- c.sprintf ( "%.2f ", l_sub->getsize_mb());
- - item->setText ( col2,c +i18n ( "MB" ) );
- + item->setText ( col2,c +i18n( "MB" ) );
- item->setTextAlignment ( col2,Qt::AlignRight );
- }
- item->setText ( col3, l_sub->getcontent() );
- @@ -1207,7 +1207,7 @@
- execCopy.setDvd ( dvd );
- execCopy.setPath(Ui_MainDlg.urOutput->url().path());
- execCopy.CreateMP4();
- - changeStatusbar ( i18n ( "Ready" ) ,sbMessage );
- + changeStatusbar ( i18n( "Ready" ) ,sbMessage );
-
- }
-
- @@ -1216,7 +1216,7 @@
- execCopy.setDvd ( dvd );
- execCopy.setPath(Ui_MainDlg.urOutput->url().path());
- execCopy.extractAudio();
- - changeStatusbar ( i18n ( "Ready" ) ,sbMessage );
- + changeStatusbar ( i18n( "Ready" ) ,sbMessage );
-
- }
-
- @@ -1226,7 +1226,7 @@
- execCopy.setDvd ( dvd );
- execCopy.setPath(Ui_MainDlg.urOutput->url().path());
- execCopy.extractMPEG2();
- - changeStatusbar ( i18n ( "Ready" ) ,sbMessage );
- + changeStatusbar ( i18n( "Ready" ) ,sbMessage );
-
-
- }
- @@ -1365,7 +1365,7 @@
- if ( drive !=NULL ) {
- QList <int>list=drive->getWriteSpeeds();
- Ui_MainDlg.cbBurnSpeed->clear();
- - Ui_MainDlg.cbBurnSpeed->addItem ( i18n ( "default" ) );
- + Ui_MainDlg.cbBurnSpeed->addItem ( i18n( "default" ) );
- foreach ( int speed,list ) {
- Ui_MainDlg.cbBurnSpeed->addItem ( QString::number ( ( double ) ( speed ) /1385 ) );
- }
- @@ -1389,7 +1389,7 @@
-
-
- void k9Main::bInputOpenClick() {
- - QString result=k9Dialogs::getOpenFileName ( QDir::homePath(),"*.iso", 0,i18n ( "Open ISO Image" ) );
- + QString result=k9Dialogs::getOpenFileName ( QDir::homePath(),"*.iso", 0,i18n( "Open ISO Image" ) );
- if ( result!="" ) {
- k9Tools::setComboText ( Ui_MainDlg.cbInputDev,result );
- Open();
- @@ -1482,7 +1482,7 @@
- }
- else {
- changeStatusbar ( QString::number ( dbfactor,'f',2 ),sbFactor );
- - changeStatusbar ( i18n("%1 MB").arg(QString::number ((double)sizeSelected/512.,'f',2)),sbSelSize);
- + changeStatusbar ( i18n("%1 MB",QString::number ((double)sizeSelected/512.,'f',2)),sbSelSize);
- }
- emit SelectionChanged ( dvd,withMenus() );
- m_mutex.unlock();
- diff -Naur k9copy-work/src/main/k9titlefactor.cpp k9copy/src/main/k9titlefactor.cpp
- --- k9copy-work/src/main/k9titlefactor.cpp 2014-09-29 11:00:12.000000000 -0400
- +++ k9copy/src/main/k9titlefactor.cpp 2020-12-23 23:51:35.909155787 -0500
- @@ -60,7 +60,7 @@
- }
- double size;
- size =m_current->getChaptersSize_mb(true) / getFactor();
- - Ui_titleFactor.lTargetSize->setText(i18n("size : %1 MB").arg(size ));
- + Ui_titleFactor.lTargetSize->setText(i18n("size : %1 MB",size ));
- }
- }
-
- @@ -97,7 +97,7 @@
- Ui_titleFactor.tFactor->setText(QString("%1").arg(getFactor(),4,'f',2));
- size =m_current->getChaptersSize_mb(true) / getFactor();
- }
- - Ui_titleFactor.lTargetSize->setText(i18n("size : %1 MB").arg(size ));
- + Ui_titleFactor.lTargetSize->setText(i18n("size : %1 MB",size ));
-
-
- }
- @@ -118,7 +118,7 @@
- Ui_titleFactor.gbTitle->setChecked(m_current->getforceFactor());
- m_updating=false;
-
- - Ui_titleFactor.lbTitle->setText(i18n("Shrink Factor for %1").arg(m_current->getname()));
- + Ui_titleFactor.lbTitle->setText(i18n("Shrink Factor for %1",m_current->getname()));
- double size;
- if (m_current->getforceFactor()) {
- Ui_titleFactor.slFactor->setValue(m_current->getfactor()*100.0);
- @@ -131,7 +131,7 @@
- Ui_titleFactor.slFactor->setMinimum(100);
- size =m_current->getChaptersSize_mb(true) / getFactor();
- }
- - Ui_titleFactor.lTargetSize->setText(i18n("size : %1 MB").arg(size ));
- + Ui_titleFactor.lTargetSize->setText(i18n("size : %1 MB",size ));
-
- }
-
- diff -Naur k9copy-work/src/mplayer/k9mplayer.cpp k9copy/src/mplayer/k9mplayer.cpp
- --- k9copy-work/src/mplayer/k9mplayer.cpp 2014-09-29 11:00:12.000000000 -0400
- +++ k9copy/src/mplayer/k9mplayer.cpp 2020-12-23 23:48:01.709471987 -0500
- @@ -174,7 +174,7 @@
-
- qDebug() << m_process->debug();
- if (!m_process->start()) {
- - k9Dialogs::error (i18n("Unable to run %1").arg("mplayer") , i18n("Preview"));
- + k9Dialogs::error (i18n("Unable to run %1","mplayer") , i18n("Preview"));
- }
-
- m_canwrite=TRUE;
- diff -Naur k9copy-work/src/player/k9play.cpp k9copy/src/player/k9play.cpp
- --- k9copy-work/src/player/k9play.cpp 2020-12-23 23:47:42.379321457 -0500
- +++ k9copy/src/player/k9play.cpp 2020-12-23 23:48:01.709471987 -0500
- @@ -366,7 +366,7 @@
- /* set read ahead cache usage */
- if (dvdnav_set_readahead_flag(dvdnav, DVD_READ_CACHE) != DVDNAV_STATUS_OK) {
- writeOutput( QString("ERR:Error on dvdnav_set_readahead_flag: %1\n").arg(dvdnav_err_to_string(dvdnav)));
- - emit sigError(i18n("Error on dvdnav_set_readahead_flag: %1").arg(dvdnav_err_to_string(dvdnav)));
- + emit sigError(i18n("Error on dvdnav_set_readahead_flag: %1",dvdnav_err_to_string(dvdnav)));
- end();
- return;
- }
|