k9copy-i18n.patch 41 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821822823824825826827828829830831832833834835836837838839840841842843844845846847848849850851852853854855856857858859860861862863864865866867868869870871872873874875876877878879880881882883884885886887888889890891892893894895896897898899900901902903904905906907908909910911912913914915916917918919920921922923924925926927928929930931932933934935936937938939940941942943
  1. diff -Naur k9copy-work/src/assistant/k9aststreams.cpp k9copy/src/assistant/k9aststreams.cpp
  2. --- k9copy-work/src/assistant/k9aststreams.cpp 2014-09-29 11:00:12.000000000 -0400
  3. +++ k9copy/src/assistant/k9aststreams.cpp 2020-12-23 23:53:38.473154933 -0500
  4. @@ -54,7 +54,7 @@
  5. showDefault(false);
  6. setFlags(Qt::ItemIsEnabled | Qt::ItemIsUserCheckable | Qt::ItemIsSelectable);
  7. setCheckState(0,_stream->getselected()?Qt::Checked:Qt::Unchecked);
  8. - setText(0,i18n("%4 - %1 %2 %3 ch").arg(_stream->getlanguage()).arg(_stream->getformat()).arg(_stream->getchannels()).arg(_stream->getID()));
  9. + setText(0,i18n("%4 - %1 %2 %3 ch",_stream->getlanguage(),_stream->getformat(),_stream->getchannels(),_stream->getID()));
  10. setIcon(0,SmallIcon("sound")) ;
  11. //setText(1,i18n("%1 MB",_stream->getsize_mb()));
  12. }
  13. @@ -65,7 +65,7 @@
  14. showDefault(false);
  15. setFlags(Qt::ItemIsEnabled | Qt::ItemIsUserCheckable | Qt::ItemIsSelectable);
  16. setCheckState(0,_stream->getselected()?Qt::Checked:Qt::Unchecked);
  17. - setText(0,i18n("%3 - %1 %2").arg(_stream->getlanguage()).arg(_stream->getcontent()).arg(_stream->getID().first()));
  18. + setText(0,i18n("%3 - %1 %2",_stream->getlanguage(),_stream->getcontent(),_stream->getID().first()));
  19. setIcon(0,SmallIcon("subtitle"));
  20. //setText(1,i18n("%1 MB",_stream->getsize_mb()));
  21. diff -Naur k9copy-work/src/assistant/k9asttitles.cpp k9copy/src/assistant/k9asttitles.cpp
  22. --- k9copy-work/src/assistant/k9asttitles.cpp 2014-09-29 11:00:12.000000000 -0400
  23. +++ k9copy/src/assistant/k9asttitles.cpp 2020-12-23 23:48:01.704471948 -0500
  24. @@ -276,22 +276,22 @@
  25. int ch=0;
  26. for (int i=0;i< _title->getchapterCount();i++) {
  27. _k9ItemWidget *it =new _k9ItemWidget(_title->getChapter(i),_parent,k9astTitles::CHAPTER);
  28. - it->setText(1,i18n("chapter %1").arg(++ch));
  29. + it->setText(1,i18n("chapter %1",++ch));
  30. QString s;
  31. s=QString("%1").arg((double)(_title->getChapter(i)->getsectors()) /512,0,'f',2);
  32. it->setText(2,QString("%1").arg(_title->getChapter(i)->getLength().toString("hh:mm:ss")));
  33. - it->setText(3,i18n("%1 MB").arg(s));
  34. + it->setText(3,i18n("%1 MB",s));
  35. }
  36. for (int j=0;j <_title->getTitles().count();j++) {
  37. k9DVDTitle *title2=_title->getTitles().at(j);
  38. for (int i=0;i< title2->getchapterCount();i++) {
  39. _k9ItemWidget *it =new _k9ItemWidget(title2->getChapter(i),_parent,k9astTitles::CHAPTER);
  40. - it->setText(1,i18n("chapter %1").arg(++ch));
  41. + it->setText(1,i18n("chapter %1",++ch));
  42. QString s;
  43. s=QString("%1").arg((double)(title2->getChapter(i)->getsectors()) /512,0,'f',2);
  44. it->setText(2,QString("%1").arg(title2->getChapter(i)->getLength().toString("hh:mm:ss")));
  45. - it->setText(3,i18n("%1 MB").arg(s));
  46. + it->setText(3,i18n("%1 MB",s));
  47. }
  48. }
  49. diff -Naur k9copy-work/src/backup/k9dvdauthor.cpp k9copy/src/backup/k9dvdauthor.cpp
  50. --- k9copy-work/src/backup/k9dvdauthor.cpp 2014-09-29 11:00:12.000000000 -0400
  51. +++ k9copy/src/backup/k9dvdauthor.cpp 2020-12-23 23:48:01.704471948 -0500
  52. @@ -161,7 +161,7 @@
  53. error=true;
  54. QString sMsg;
  55. //sMsg.QString::sprintf(tr2i18n("'%s' not selected"),l_track->getname().latin1());
  56. - sMsg=i18n("'%1' not selected").arg(l_track->getname());
  57. + sMsg=i18n("'%1' not selected",l_track->getname());
  58. k9Dialogs::error( sMsg, i18n("authoring"));
  59. }
  60. start.sprintf("jump titleset %d menu;",DVD->getnewTitleNum(l_track));
  61. @@ -415,7 +415,7 @@
  62. c.sprintf("g1=%d;\ncall vmgm menu;",DVD->getnewTitleNum(l_next));
  63. if ( DVD->getnewTitleNum(l_next)==-1) {
  64. error=true;
  65. - c=i18n("'%1' not selected").arg(l_next->getname());
  66. + c=i18n("'%1' not selected",l_next->getname());
  67. k9Dialogs::error( c, i18n("authoring"));
  68. }
  69. @@ -439,7 +439,7 @@
  70. void k9DVDAuthor::author() {
  71. k9Config config;
  72. if ( ! k9Tools::checkProgram("dvdauthor")) {
  73. - k9Dialogs::error (i18n("Unable to run %1").arg("dvdauthor") , i18n("authoring"));
  74. + k9Dialogs::error (i18n("Unable to run %1","dvdauthor") , i18n("authoring"));
  75. error = TRUE;
  76. return;
  77. }
  78. diff -Naur k9copy-work/src/backup/k9dvdbackup.cpp k9copy/src/backup/k9dvdbackup.cpp
  79. --- k9copy-work/src/backup/k9dvdbackup.cpp 2020-12-23 23:47:42.374321418 -0500
  80. +++ k9copy/src/backup/k9dvdbackup.cpp 2020-12-23 23:48:01.705471956 -0500
  81. @@ -295,13 +295,13 @@
  82. k9DVDFile *dvdfile;
  83. if ((dvdfile = m_dvdread->openTitle( _vts))== 0) {
  84. QString stmp;
  85. - stmp=i18n("Unable to open titleset %1").arg(_vts);
  86. + stmp=i18n("Unable to open titleset %1",_vts);
  87. seterror(stmp);
  88. return ;
  89. }
  90. setTotalSteps(vts_handle->vtsi_mat->vts_last_sector-vts_handle->vtsi_mat->vtstt_vobs -1);
  91. QString c;
  92. - c=i18n("Extracting titleset %1").arg(_vts);
  93. + c=i18n("Extracting titleset %1",_vts);
  94. setProgressLabel(c);
  95. if (!k9Tools::getBatchCopy())
  96. backupDlg->show();
  97. @@ -477,7 +477,7 @@
  98. k9DVDFile *dvdfile;
  99. if ((dvdfile = m_dvdread->openMenu( _vts))== 0) {
  100. QString stmp;
  101. - stmp=i18n("Unable to open menu for titleset %1").arg(_vts);
  102. + stmp=i18n("Unable to open menu for titleset %1",_vts);
  103. seterror (stmp);
  104. return 0;
  105. }
  106. @@ -503,7 +503,7 @@
  107. uint32_t sector, dsi_next_vobu = 0;
  108. uint32_t imax=length/sizeof(cell_adr_t);
  109. QString c;
  110. - c=i18n("Extracting menu for titleset %1").arg(_vts);
  111. + c=i18n("Extracting menu for titleset %1",_vts);
  112. setProgressLabel(c);
  113. if (!k9Tools::getBatchCopy()) {
  114. backupDlg->show();
  115. @@ -597,7 +597,7 @@
  116. vts_handle=currTS->ifoTitle->getIFO();
  117. if (!vts_handle) {
  118. QString stmp;
  119. - stmp=i18n("Unable to open ifo file for titleset %1").arg(vts_num);
  120. + stmp=i18n("Unable to open ifo file for titleset %1",vts_num);
  121. seterror (stmp);
  122. //JMP vamps->setNoData();
  123. return;
  124. @@ -605,7 +605,7 @@
  125. setTotalSteps( vts_handle->vtsi_mat->vts_last_sector-vts_handle->vtsi_mat->vtstt_vobs -1);
  126. QString c;
  127. - c=i18n("Extracting titleset %1").arg(vts_num);
  128. + c=i18n("Extracting titleset %1",vts_num);
  129. setProgressLabel(c);
  130. if (!k9Tools::getBatchCopy())
  131. backupDlg->show();
  132. @@ -620,7 +620,7 @@
  133. dvdfile = m_dvdread->openTitle (vts_num);
  134. if (! dvdfile) {
  135. QString stmp;
  136. - stmp=i18n("Unable to open vobs for titleset %1").arg(vts_num);
  137. + stmp=i18n("Unable to open vobs for titleset %1",vts_num);
  138. seterror( stmp);
  139. //JMP vamps->setNoData();
  140. return;
  141. @@ -1450,7 +1450,7 @@
  142. sName="VIDEO_TS.VOB";
  143. else
  144. sName.sprintf("VTS_%02d_%d.VOB",(int)currVTS,(int)VobNum);
  145. - dbg=i18n("Updating vob %1").arg(sName);
  146. + dbg=i18n("Updating vob %1",sName);
  147. sName=output+"/"+sName;
  148. QFileInfo finfo(sName);
  149. long fileSize=finfo.size();
  150. diff -Naur k9copy-work/src/backup/k9execcopy.cpp k9copy/src/backup/k9execcopy.cpp
  151. --- k9copy-work/src/backup/k9execcopy.cpp 2020-12-23 23:47:42.374321418 -0500
  152. +++ k9copy/src/backup/k9execcopy.cpp 2020-12-23 23:48:01.705471956 -0500
  153. @@ -39,7 +39,7 @@
  154. m_cancelled=false;
  155. QString filename;
  156. if (!m_dvd->getopened()) {
  157. - k9Dialogs::error( i18n("DVD is not opened"), i18n("DVD Copy"));
  158. + k9Dialogs::error( i18n("DVD is not opened"),i18n("DVD Copy"));
  159. return;
  160. }
  161. @@ -70,7 +70,7 @@
  162. long fs=k9Tools::getFreeSpace(outputDir);
  163. int maxSize=config.getPrefSize() < (m_dvd->getsizeSelected(false)/512) ? config.getPrefSize():(m_dvd->getsizeSelected(false)/512);
  164. if ((fs < maxSize) && (fs !=-1)) {
  165. - if (k9Dialogs::warningContinueCancel ( i18n("Insufficient disk space on %1\n%2 MB expected.").arg(outputDir).arg(config.getPrefSize()),i18n("DVD Copy"))==cancel)
  166. + if (k9Dialogs::warningContinueCancel ( i18n("Insufficient disk space on %1\n%2 MB expected.",outputDir,config.getPrefSize()),i18n("DVD Copy"))==cancel)
  167. return;
  168. }
  169. @@ -188,7 +188,7 @@
  170. if (matroska) {
  171. if ( ! k9Tools::checkProgram("mkvmerge") ) {
  172. - k9Dialogs::error (i18n("Unable to run %1").arg("mkvmerge") , i18n("Encoding error"));
  173. + k9Dialogs::error (i18n("Unable to run %1","mkvmerge") , i18n("Encoding error"));
  174. delete mp4;
  175. return ;
  176. }
  177. diff -Naur k9copy-work/src/backup/k9mp4enc.cpp k9copy/src/backup/k9mp4enc.cpp
  178. --- k9copy-work/src/backup/k9mp4enc.cpp 2014-09-29 11:00:12.000000000 -0400
  179. +++ k9copy/src/backup/k9mp4enc.cpp 2020-12-23 23:48:01.706471964 -0500
  180. @@ -157,8 +157,8 @@
  181. if (!m_extractAudio) {
  182. if ( ! k9Tools::checkProgram(sCodecV) ) {
  183. - k9log::add(i18n("Unable to run %1").arg(sCodecV),k9logLevel::ERROR);
  184. - k9Dialogs::error (i18n("Unable to run %1").arg(sCodecV) , i18n("Encoding error"));
  185. + k9log::add(i18n("Unable to run %1",sCodecV),k9logLevel::ERROR);
  186. + k9Dialogs::error (i18n("Unable to run %1",sCodecV) , i18n("Encoding error"));
  187. m_error = TRUE;
  188. return false;
  189. }
  190. @@ -168,8 +168,8 @@
  191. if ((sCodecA!=sCodecV) || m_extractAudio) {
  192. if ( ! k9Tools::checkProgram(sCodecA) ) {
  193. - k9log::add(i18n("Unable to run %1").arg(sCodecV),k9logLevel::ERROR);
  194. - k9Dialogs::error (i18n("Unable to run %1").arg(sCodecA) , i18n("Encoding error"));
  195. + k9log::add(i18n("Unable to run %1",sCodecV),k9logLevel::ERROR);
  196. + k9Dialogs::error (i18n("Unable to run %1",sCodecA) , i18n("Encoding error"));
  197. m_error = TRUE;
  198. return false;
  199. }
  200. @@ -181,12 +181,12 @@
  201. void k9MP4Enc::execute(k9DVDTitle *_title) {
  202. if (m_mpeg2)
  203. - k9log::add(i18n("Starting extraction of %1, chapters %2").arg(_title->getname()).arg(getChapterList( _title)),k9logLevel::INFO);
  204. + k9log::add(i18n("Starting extraction of %1, chapters %2",_title->getname(),getChapterList( _title)),k9logLevel::INFO);
  205. else
  206. - k9log::add(i18n("Starting encoding of %1, chapters %2").arg(_title->getname()).arg(getChapterList( _title)),k9logLevel::INFO);
  207. - k9log::add(i18n("source : %1").arg(m_device),k9logLevel::INFO);
  208. - k9log::add(i18n("destination : %1").arg(m_filename),k9logLevel::INFO);
  209. - k9log::add(i18n("disk cache : %1").arg( m_usecache ? i18n("activated"):i18n("disabled")),k9logLevel::INFO);
  210. + k9log::add(i18n("Starting encoding of %1, chapters %2",_title->getname(),getChapterList( _title)),k9logLevel::INFO);
  211. + k9log::add(i18n("source : %1",m_device),k9logLevel::INFO);
  212. + k9log::add(i18n("destination : %1",m_filename),k9logLevel::INFO);
  213. + k9log::add(i18n("disk cache : %1", m_usecache ? i18n("activated"):i18n("disabled")),k9logLevel::INFO);
  214. m_currentChapter=0;
  215. m_error=false;
  216. m_outputFile=NULL;
  217. @@ -205,14 +205,14 @@
  218. m_remain="--:--:--";
  219. m_totalSize=_title->getChaptersSize(true);
  220. - k9log::add(i18n("size : %1 MB").arg(m_totalSize/512),k9logLevel::INFO);
  221. + k9log::add(i18n("size : %1 MB",m_totalSize/512),k9logLevel::INFO);
  222. if (!m_mpeg2) {
  223. - k9log::add(i18n("audio bitrate : %1").arg(m_audioBitrate),k9logLevel::INFO);
  224. + k9log::add(i18n("audio bitrate : %1",m_audioBitrate),k9logLevel::INFO);
  225. if (!m_extractAudio) {
  226. if (m_videoBitrate !="")
  227. - k9log::add(i18n("user defined video bitrate : %1").arg(m_videoBitrate),k9logLevel::INFO);
  228. + k9log::add(i18n("user defined video bitrate : %1",m_videoBitrate),k9logLevel::INFO);
  229. else
  230. - k9log::add(i18n("calculated video bitrate : %1").arg(getBitRate(_title)),k9logLevel::INFO);
  231. + k9log::add(i18n("calculated video bitrate : %1",getBitRate(_title)),k9logLevel::INFO);
  232. }
  233. }
  234. QString injectName;
  235. @@ -239,7 +239,7 @@
  236. do {
  237. if (!m_mpeg2)
  238. - k9log::add(i18n("starting pass %1 of %2").arg(pass==0 ? 1:pass).arg(maxPass==0 ? 1 : maxPass),k9logLevel::INFO);
  239. + k9log::add(i18n("starting pass %1 of %2",pass==0 ? 1:pass,maxPass==0 ? 1 : maxPass),k9logLevel::INFO);
  240. m_totalBytes=0;
  241. m_vamps=new k9vamps(this,m_usecache);;
  242. m_player=new k9play(this);
  243. @@ -507,7 +507,7 @@
  244. QString sAOption=replaceParams(audioCodecs->getOptions(m_audioCodec)).trimmed();
  245. - m_progress->setTitleLabel(i18n("Encoding %1").arg(sCodec));
  246. + m_progress->setTitleLabel(i18n("Encoding %1",sCodec));
  247. QString path,ext=audioCodecs->getExtension(m_audioCodec) ;
  248. if (!ext.startsWith("."))
  249. ext="."+ext;
  250. @@ -519,7 +519,7 @@
  251. cmd << m_ffmpegPath << "-i" << "/dev/stdin" <<sAOption.split(" ") << KShell::quoteArg(path) ;
  252. - k9log::add(i18n("starting thread : %1").arg(cmd.join(" ")),k9logLevel::INFO);
  253. + k9log::add(i18n("starting thread : %1",cmd.join(" ")),k9logLevel::INFO);
  254. k9ConvertAudio *converter=new k9ConvertAudio("",cmd);
  255. m_converters[BASE_CONV_AUDIO+i]=converter;
  256. m_convertersToDelete << converter;
  257. @@ -571,9 +571,9 @@
  258. cmd << sVOption.split(" ");
  259. if (pass >0)
  260. - m_progress->setTitleLabel(i18n("Encoding %1").arg(sCodec)+" - "+i18n("pass %1").arg(pass));
  261. + m_progress->setTitleLabel(i18n("Encoding %1",sCodec)+" - "+i18n("pass %1",pass));
  262. else
  263. - m_progress->setTitleLabel(i18n("Encoding %1").arg(sCodec));
  264. + m_progress->setTitleLabel(i18n("Encoding %1",sCodec));
  265. if (m_fourcc !="")
  266. cmd << "-vtag" << m_fourcc;
  267. @@ -640,7 +640,7 @@
  268. cmd << "-y" << KShell::quoteArg(path);
  269. cmd << slNewAudio;
  270. // if (m_extractMkv) {
  271. - k9log::add(i18n("starting thread : %1").arg(cmd.join(" ")),k9logLevel::INFO);
  272. + k9log::add(i18n("starting thread : %1",cmd.join(" ")),k9logLevel::INFO);
  273. k9ConvertAudio *converter=new k9ConvertAudio("",cmd);
  274. //converter->setDebug(true);
  275. m_converters[BASE_CONV_VIDEO]=converter;
  276. @@ -690,9 +690,9 @@
  277. if (pass >0)
  278. - m_progress->setTitleLabel(i18n("Encoding %1").arg(sCodec)+" - "+i18n("pass %1").arg(pass));
  279. + m_progress->setTitleLabel(i18n("Encoding %1",sCodec)+" - "+i18n("pass %1",pass));
  280. else
  281. - m_progress->setTitleLabel(i18n("Encoding %1").arg(sCodec));
  282. + m_progress->setTitleLabel(i18n("Encoding %1",sCodec));
  283. if (m_fourcc !="")
  284. cmd << "-ffourcc" << m_fourcc;
  285. @@ -747,7 +747,7 @@
  286. // cmd << "-of" << "lavf";
  287. // cmd << "-lavfopts" << "i_certify_that_my_video_stream_does_not_use_b_frames";
  288. }
  289. - k9log::add(i18n("starting thread : %1").arg(cmd.join(" ")),k9logLevel::INFO);
  290. + k9log::add(i18n("starting thread : %1",cmd.join(" ")),k9logLevel::INFO);
  291. k9ConvertAudio *converter=new k9ConvertAudio("",cmd);
  292. converter->setDebug(false);
  293. m_converters[BASE_CONV_VIDEO]=converter;
  294. @@ -894,7 +894,7 @@
  295. else {
  296. m_player->setAborted(true);
  297. m_error=true;
  298. - m_msgError=i18n("An error occured while encoding the %1 stream").arg(i18n("audio"));
  299. + m_msgError=i18n("An error occured while encoding the %1 stream",i18n("audio"));
  300. m_ErrorDetail=c->getOutput();
  301. k9log::add(m_msgError,k9logLevel::ERROR);
  302. }
  303. @@ -919,7 +919,7 @@
  304. else {
  305. m_player->setAborted(true);
  306. m_error=true;
  307. - m_msgError=i18n("An error occured while encoding the %1 stream").arg(i18n("video"));
  308. + m_msgError=i18n("An error occured while encoding the %1 stream",i18n("video"));
  309. m_ErrorDetail=c->getOutput();
  310. k9log::add(m_msgError,k9logLevel::ERROR);
  311. }
  312. diff -Naur k9copy-work/src/core/k9burndvd.cpp k9copy/src/core/k9burndvd.cpp
  313. --- k9copy-work/src/core/k9burndvd.cpp 2014-09-29 11:00:12.000000000 -0400
  314. +++ k9copy/src/core/k9burndvd.cpp 2020-12-23 23:48:01.706471964 -0500
  315. @@ -148,7 +148,7 @@
  316. proc2->sync();
  317. if (proc2->exitStatus()==0) {
  318. delete proc2;
  319. - k9log::add(i18n("image size : %1").arg(imageSize),k9logLevel::INFO);
  320. + k9log::add(i18n("image size : %1",imageSize),k9logLevel::INFO);
  321. return imageSize;
  322. }
  323. }
  324. @@ -234,7 +234,7 @@
  325. connect( proc2, SIGNAL(receivedStdout(char *, int)),this, SLOT(mkisoSizeStdout(char *, int)) );
  326. k9log::add(i18n("computing image size"),k9logLevel::INFO);
  327. proc2->setShellCommand(proc2Cmd.join(" "));;
  328. - k9log::add(i18n("starting thread : %1").arg(proc2Cmd.join(" ")),k9logLevel::INFO);
  329. + k9log::add(i18n("starting thread : %1",proc2Cmd.join(" ")),k9logLevel::INFO);
  330. proc2->start();
  331. proc2->sync();
  332. getWodimCmd(procCmd);
  333. @@ -243,7 +243,7 @@
  334. if (!autoBurn) {
  335. #if QT_VERSION >= 0x050000
  336. - if ( k9Dialogs::warningContinueCancel ( i18n("Insert a recordable DVD"), i18n("DVD burning"))!=QMessageBox::Ignore)
  337. + if ( k9Dialogs::warningContinueCancel ( i18n("Insert a recordable DVD"),i18n("DVD burning"))!=QMessageBox::Ignore)
  338. #else
  339. if ( k9Dialogs::warningContinueCancel ( i18n("Insert a recordable DVD"), i18n("DVD burning"))!=KMessageBox::Continue)
  340. #endif
  341. @@ -255,12 +255,12 @@
  342. if (!cancelled) {
  343. k9log::add(i18n("start burning"),k9logLevel::INFO);
  344. - k9log::add(i18n("starting thread : %1").arg(procCmd.join(" ")),k9logLevel::INFO);
  345. + k9log::add(i18n("starting thread : %1",procCmd.join(" ")),k9logLevel::INFO);
  346. int res=progress->execute();
  347. if ( res==-1 ) {
  348. k9log::add(i18n("Error"),k9logLevel::ERROR);
  349. - k9Dialogs::error( i18n("Error burning DVD :\n")+i18n("Unable to run %1").arg("genisoimage"), i18n("DVD burning") );
  350. + k9Dialogs::error( i18n("Error burning DVD :\n")+i18n("Unable to run %1", "genisoimage"),i18n("DVD burning") );
  351. cancelled=true;
  352. } else {
  353. @@ -353,13 +353,13 @@
  354. }
  355. if (!cancelled) {
  356. k9log::add(i18n("start burning"),k9logLevel::INFO);
  357. - k9log::add(i18n("starting thread : %1").arg(proc->debug()),k9logLevel::INFO);
  358. + k9log::add(i18n("starting thread : %1",proc->debug()),k9logLevel::INFO);
  359. int res=progress->execute();
  360. if ( res==-1 ) {
  361. k9log::add(i18n("Error"),k9logLevel::ERROR);
  362. - k9Dialogs::error( i18n("Error burning DVD :\n")+i18n("Unable to run %1").arg(progname), i18n("DVD burning") );
  363. + k9Dialogs::error( i18n("Error burning DVD :\n")+i18n("Unable to run %1",progname), i18n("DVD burning") );
  364. cancelled=true;
  365. } else {
  366. @@ -413,7 +413,7 @@
  367. }
  368. progress->setTitle(i18n("Burning DVD"));
  369. - progress->setLabelText(i18n("Current write speed :%1 x").arg(burnSpeed));
  370. + progress->setLabelText(i18n("Current write speed :%1 x",burnSpeed));
  371. if (c.contains("% done")) {
  372. pos=c.indexOf("%");
  373. if (pos!=-1) {
  374. @@ -433,7 +433,7 @@
  375. }
  376. }
  377. }
  378. - else k9log::add(i18n("%1").arg(c),k9logLevel::INFO);
  379. + else k9log::add(i18n("%1",c),k9logLevel::INFO);
  380. }
  381. }
  382. void k9BurnDVD::growisoStdout(char *buffer, int buflen) {
  383. diff -Naur k9copy-work/src/core/k9dvd.cpp k9copy/src/core/k9dvd.cpp
  384. --- k9copy-work/src/core/k9dvd.cpp 2014-09-29 11:00:12.000000000 -0400
  385. +++ k9copy/src/core/k9dvd.cpp 2020-12-23 23:48:01.707471971 -0500
  386. @@ -214,7 +214,7 @@
  387. int i;
  388. QString c;
  389. if (! (filehandle = fopen(dvd_device, "r"))) {
  390. - c=i18n("Couldn't open %1 for title\n").arg(dvd_device);
  391. + c=i18n("Couldn't open %1 for title\n",dvd_device);
  392. // setError(c );
  393. strcpy(title, i18n("unknown").toUtf8());
  394. return -1;
  395. @@ -222,7 +222,7 @@
  396. if ( fseek(filehandle, 32808, SEEK_SET )) {
  397. fclose(filehandle);
  398. - c=i18n("Couldn't seek in %1 for title\n").arg(dvd_device);
  399. + c=i18n("Couldn't seek in %1 for title\n",dvd_device);
  400. setError(c);
  401. strcpy(title, i18n("unknown").toUtf8());
  402. return -1;
  403. @@ -377,7 +377,7 @@
  404. m_dvd.close();
  405. m_dvd.openDevice(device);
  406. if ( !m_dvd.opened() ) {
  407. - c=i18n("Can't open disc %1!\n").arg(device);
  408. + c=i18n("Can't open disc %1!\n",device);
  409. setError(c);
  410. return 2;
  411. }
  412. @@ -411,7 +411,7 @@
  413. ifo = kifo->getIFO();
  414. if (ifo==NULL) {
  415. //ifo is null when trying to open a protected dvd
  416. - setError(i18n("Can't open disc %1!\n").arg(device));
  417. + setError(i18n("Can't open disc %1!\n",device));
  418. return 2;
  419. //continue;
  420. }
  421. @@ -435,7 +435,7 @@
  422. vts_ttn = ttn;//ifo->vts_ptt_srpt->title[j].ptt[0].pgcn; //ifo_zero->tt_srpt->title[j].vts_ttn;
  423. //JMPtxt=i18n("Title %1").arg(indexedCount);
  424. - txt=i18n("Title %1").arg(numTitle);
  425. + txt=i18n("Title %1",numTitle);
  426. emit sigTotalText (txt);
  427. emit sigTitleProgress(numTitle,ltitles);
  428. video_attr = &vtsi_mat->vts_video_attr;
  429. @@ -725,7 +725,7 @@
  430. }
  431. if (bappend)
  432. m_titles.append(track);
  433. - track->name=i18n("Title %1").arg(num);
  434. + track->name=i18n("Title %1",num);
  435. if (!_indexed) {
  436. for (int i=0;i<m_titles.count();i++) {
  437. @@ -895,7 +895,7 @@
  438. QString c;
  439. dvdfile =m_dvd.openTitle( title);
  440. if ( !dvdfile ) {
  441. - c=i18n("Error opening vobs for title %1\n").arg(title);
  442. + c=i18n("Error opening vobs for title %1\n",title);
  443. setError(c);
  444. return 0;
  445. }
  446. @@ -906,7 +906,7 @@
  447. emit sigVobProgress(i-startblock,lastblock-startblock);
  448. total+=size;
  449. if ( !size ) {
  450. - c=i18n("ERROR reading block %1\n").arg(i);
  451. + c=i18n("ERROR reading block %1\n",i);
  452. setError(c);
  453. break;
  454. }
  455. diff -Naur k9copy-work/src/import/k9avidecode.cpp k9copy/src/import/k9avidecode.cpp
  456. --- k9copy-work/src/import/k9avidecode.cpp 2014-09-29 11:00:12.000000000 -0400
  457. +++ k9copy/src/import/k9avidecode.cpp 2020-12-23 23:48:01.707471971 -0500
  458. @@ -53,20 +53,20 @@
  459. m_error="";
  460. QStringList errs;
  461. if (!CodecHandle) {
  462. - errs << i18n("Cannot open the library %1").arg("libavcodec");
  463. + errs << i18n("Cannot open the library %1","libavcodec");
  464. }
  465. if (!FormatHandle ) {
  466. - errs << i18n("Cannot open the library %1").arg("libavformat");
  467. + errs << i18n("Cannot open the library %1","libavformat");
  468. }
  469. # if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 33, 0)
  470. if (!UtilHandle) {
  471. - m_error =i18n("Cannot open then library %1").arg("libavutil");
  472. + m_error =i18n("Cannot open then library %1","libavutil");
  473. return;
  474. }
  475. # endif
  476. #ifdef HAVE_SWSCALE
  477. if (!SwscaleHandle) {
  478. - errs << i18n("Cannot open the library %1").arg("libswscale");
  479. + errs << i18n("Cannot open the library %1","libswscale");
  480. }
  481. #endif
  482. @@ -101,7 +101,7 @@
  483. img_convert = (img_convert_t)dlsym(CodecHandle,"img_convert");
  484. //if img_convert is null (deprecated in ffmpeg), we need libswscale
  485. if (!img_convert)
  486. - errs << i18n("Cannot open the library %1").arg("libswscale");
  487. + errs << i18n("Cannot open the library %1","libswscale");
  488. #endif
  489. av_free = (av_free_t)dlsym(CodecHandle,"av_free");
  490. av_free_packet = (av_free_packet_t)dlsym(CodecHandle,"av_free_packet");
  491. @@ -174,7 +174,7 @@
  492. av_open_input_file(&m_FormatCtx, _fileName.toUtf8(), NULL, 0, NULL)!=0
  493. # endif
  494. ) {
  495. - m_error=i18n("Couldn't open the file %1").arg(_fileName);
  496. + m_error=i18n("Couldn't open the file %1",_fileName);
  497. return false; // Couldn't open file}
  498. }
  499. // Retrieve stream information
  500. @@ -231,7 +231,7 @@
  501. // Allocate an AVFrame structure
  502. m_FrameRGB=avcodec_alloc_frame();
  503. if (m_FrameRGB==NULL) {
  504. - m_error =i18n ("Unable to allocate memory for frames");
  505. + m_error =i18n("Unable to allocate memory for frames");
  506. return false;
  507. }
  508. diff -Naur k9copy-work/src/import/k9import.cpp k9copy/src/import/k9import.cpp
  509. --- k9copy-work/src/import/k9import.cpp 2014-09-29 11:00:12.000000000 -0400
  510. +++ k9copy/src/import/k9import.cpp 2020-12-23 23:48:01.707471971 -0500
  511. @@ -186,7 +186,7 @@
  512. k9LvItemImport * itemch=new k9LvItemImport(title,k9LvItemImport::CHAPTER);
  513. - itemch->setText(0,i18n("chapter %1").arg(title->childCount()));
  514. + itemch->setText(0,i18n("chapter %1",title->childCount()));
  515. itemch->setAviFile(file);
  516. itemch->setTitle(title->getTitle());
  517. connect(file,SIGNAL(aviFileUpdated(k9AviFile*)),this,SLOT(aviFileUpdated(k9AviFile*)));
  518. @@ -201,7 +201,7 @@
  519. btn->setHeight(config.getPrefButtonHeight());
  520. btn->setScript(QString("jump title 1 chapter %1 ;").arg(title->childCount()));
  521. btn->setTextPosition(BOTTOM);
  522. - btn->setText(i18n("chapter %1").arg(title->childCount()));
  523. + btn->setText(i18n("chapter %1",title->childCount()));
  524. btn->setColor(config.getPrefButtonTextColor());
  525. btn->setFont(config.getPrefButtonFont());
  526. file->setButton(btn);
  527. diff -Naur k9copy-work/src/import/k9menu.cpp k9copy/src/import/k9menu.cpp
  528. --- k9copy-work/src/import/k9menu.cpp 2014-09-29 11:00:12.000000000 -0400
  529. +++ k9copy/src/import/k9menu.cpp 2020-12-23 23:48:01.707471971 -0500
  530. @@ -145,7 +145,7 @@
  531. void k9Menu::createAudio(const QString & _audioFile) {
  532. if (! (k9Tools::checkProgram("twolame",false) || k9Tools::checkProgram("toolame",false))) {
  533. m_error=true;
  534. - k9Dialogs::error(i18n("Error starting program %1").arg("twolame | toolame"),i18n("Running program"));
  535. + k9Dialogs::error(i18n("Error starting program %1","twolame | toolame"),i18n("Running program"));
  536. return;
  537. }
  538. diff -Naur k9copy-work/src/import/k9menuedit.cpp k9copy/src/import/k9menuedit.cpp
  539. --- k9copy-work/src/import/k9menuedit.cpp 2014-09-29 11:00:12.000000000 -0400
  540. +++ k9copy/src/import/k9menuedit.cpp 2020-12-23 23:48:01.708471979 -0500
  541. @@ -298,7 +298,7 @@
  542. disconnect (this,SIGNAL(endScriptChanged(const QString&)),0,0);
  543. Ui_menuEdit.cbEnd->setEnabled(true);
  544. m_scene->clearSelection();;
  545. - Ui_menuEdit.lTitle->setText(i18n("Title %1 Menu").arg(_title->getNum()+1));
  546. + Ui_menuEdit.lTitle->setText(i18n("Title %1 Menu",_title->getNum()+1));
  547. setScene(_title->getMenu()->getScene());
  548. m_menuType=TITLEMENU;
  549. Ui_menuEdit.cbStart->clear();
  550. @@ -322,7 +322,7 @@
  551. k9NewDVD *newDVD=(k9NewDVD*)_title->parent() ;
  552. k9NewDVDItems *items=newDVD->getTitles();
  553. foreach (k9Title *title,*items) {
  554. - Ui_menuEdit.cbEnd->addItem(i18n("Play Title %1").arg(title->getNum()+1));
  555. + Ui_menuEdit.cbEnd->addItem(i18n("Play Title %1",title->getNum()+1));
  556. QString script=QString("g6=%1; call vmgm menu;" ).arg(title->getNum()+1);
  557. m_endScripts << script;
  558. }
  559. @@ -348,7 +348,7 @@
  560. m_startScripts << "";
  561. k9NewDVDItems *items=_newDVD->getTitles();
  562. foreach (k9Title *title,*items) {
  563. - Ui_menuEdit.cbStart->addItem(i18n("Play Title %1").arg(title->getNum()+1));
  564. + Ui_menuEdit.cbStart->addItem(i18n("Play Title %1",title->getNum()+1));
  565. // QString script=QString("if (g5==0) {g5=1; jump title %1;}" ).arg(title->getNum()+1);
  566. QString script=QString("g6=%1;" ).arg(title->getNum()+1);
  567. m_startScripts << script;
  568. diff -Naur k9copy-work/src/import/k9newdvd.cpp k9copy/src/import/k9newdvd.cpp
  569. --- k9copy-work/src/import/k9newdvd.cpp 2020-12-23 23:47:42.375321426 -0500
  570. +++ k9copy/src/import/k9newdvd.cpp 2020-12-23 23:48:01.708471979 -0500
  571. @@ -175,7 +175,7 @@
  572. QString menuFileName=m_workDir+k9Tools::randomFileName()+".mpg";
  573. m_tmpFiles << menuFileName,
  574. menu->setMenuFileName(menuFileName);
  575. - m_processList->addProgress(i18n("Creating menu for title %1").arg(title->getNum()+1));
  576. + m_processList->addProgress(i18n("Creating menu for title %1",title->getNum()+1));
  577. if (!menu->createMenus(&titleSet))
  578. return;
  579. @@ -282,7 +282,7 @@
  580. break;
  581. }
  582. - k9Process *process=m_processList->addProcess(i18n("Encoding %1").arg(_aviFile->getFileName()));
  583. + k9Process *process=m_processList->addProcess(i18n("Encoding %1",_aviFile->getFileName()));
  584. m_processList->setFileName(process,_aviFile->getFileName());
  585. QTime t(0,0);
  586. @@ -499,7 +499,7 @@
  587. btn->setHeight(m_config->getPrefButtonHeight());
  588. btn->setScript(QString("g1=0;jump titleset %1 menu;").arg(_title->getNum()+1));
  589. btn->setTextPosition(RIGHT);
  590. - btn->setText(i18n("title %1").arg(_title->getNum()+1));
  591. + btn->setText(i18n("title %1",_title->getNum()+1));
  592. btn->setColor(m_config->getPrefButtonTextColor());
  593. btn->setFont(m_config->getPrefButtonFont());
  594. diff -Naur k9copy-work/src/import/k9newtitle.cpp k9copy/src/import/k9newtitle.cpp
  595. --- k9copy-work/src/import/k9newtitle.cpp 2014-09-29 11:00:12.000000000 -0400
  596. +++ k9copy/src/import/k9newtitle.cpp 2020-12-23 23:48:01.708471979 -0500
  597. @@ -126,7 +126,7 @@
  598. k9LvItemImport *item=new k9LvItemImport(m_k9Import->getRoot(),k9LvItemImport::TITLE);
  599. item->setExpanded(true);
  600. k9Title *title=new k9Title( m_k9Import->getNewDVD());
  601. - item->setText(0,i18n("title %1").arg(title->getNum() +1));
  602. + item->setText(0,i18n("title %1",title->getNum() +1));
  603. connect( title->getButton(),SIGNAL(sigsetImage(k9MenuButton*, const QImage&)),m_k9Import,SLOT(buttonUpdated(k9MenuButton*, const QImage&)));
  604. item->setTitle(title);
  605. @@ -180,7 +180,7 @@
  606. file->setEnd(t.addMSecs(qMin(pos,fileInfo.getDuration()) *1000));
  607. file->setReencode(!Ui_newTitle.ckReencode->isChecked());
  608. k9LvItemImport * itemch=new k9LvItemImport(item,k9LvItemImport::CHAPTER);
  609. - itemch->setText(0,i18n("chapter %1").arg(i+1));
  610. + itemch->setText(0,i18n("chapter %1",i+1));
  611. itemch->setText(1,file->getStart().toString("hh:mm:ss") +" - "+file->getEnd().toString("hh:mm:ss") );
  612. itemch->setAviFile(file);
  613. itemch->setTitle(title);
  614. @@ -202,7 +202,7 @@
  615. btn->setHeight(height);
  616. btn->setScript(QString("jump title 1 chapter %1 ;").arg(i+1));
  617. btn->setTextPosition(BOTTOM);
  618. - btn->setText(i18n("chapter %1").arg(i+1));
  619. + btn->setText(i18n("chapter %1",i+1));
  620. btn->setColor(config.getPrefButtonTextColor());
  621. btn->setFont(config.getPrefButtonFont());
  622. file->setButton(btn);
  623. diff -Naur k9copy-work/src/main/k9main.cpp k9copy/src/main/k9main.cpp
  624. --- k9copy-work/src/main/k9main.cpp 2014-09-29 11:00:12.000000000 -0400
  625. +++ k9copy/src/main/k9main.cpp 2020-12-23 23:48:01.708471979 -0500
  626. @@ -436,7 +436,7 @@
  627. execCopy.copyDVD();
  628. break;
  629. }
  630. - changeStatusbar ( i18n ( "Ready" ) ,sbMessage );
  631. + changeStatusbar ( i18n( "Ready" ) ,sbMessage );
  632. }
  633. @@ -457,7 +457,7 @@
  634. index=i;
  635. }
  636. QString res="";
  637. - if ( ( index==-1 ) || ( _combo->currentText() ==i18n ( "ISO Image" ) ) ) {
  638. + if ( ( index==-1 ) || ( _combo->currentText() ==i18n( "ISO Image" ) ) ) {
  639. res=_combo->currentText();
  640. } else {
  641. k9CdDrive * drive= ( k9CdDrive* ) driveList.at ( index );
  642. @@ -512,12 +512,12 @@
  643. dvd->scandvd ( sDevice,m_quickScan );
  644. if ( dvd->geterror() ) {
  645. - k9Dialogs::error ( dvd->geterrMsg(), i18n ( "Open DVD" ) );
  646. + k9Dialogs::error ( dvd->geterrMsg(), i18n( "Open DVD" ) );
  647. return;
  648. }
  649. m_parent->setDvdOpened(true);
  650. - if ( dvd->getDVDTitle() ==i18n ( "unknown" ) && sVolName!="" ) {
  651. + if ( dvd->getDVDTitle() ==i18n( "unknown" ) && sVolName!="" ) {
  652. dvd->setDVDTitle ( sVolName );
  653. }
  654. @@ -535,14 +535,14 @@
  655. ckLvItem *tsItem = new ckLvItem ( root,this,TITLESET );
  656. tsItem->setExpanded ( TRUE );
  657. QString c;
  658. - c=i18n ( "Titleset %1").arg(i+1 );
  659. + c=i18n( "Titleset %1",i+1 );
  660. tsItem->setText ( 0,c );
  661. QFont font=tsItem->font ( 1 );
  662. font.setWeight ( QFont::Bold );
  663. tsItem->setFont ( 1,font );
  664. - tsItem->setText ( 1," "+dvd->gettitleset ( i )->getsize_mb() +" " +i18n ( "MB" ) );
  665. + tsItem->setText ( 1," "+dvd->gettitleset ( i )->getsize_mb() +" " +i18n( "MB" ) );
  666. tsItem->setTextAlignment ( 1,Qt::AlignRight );
  667. tsItem->obj=dvd->gettitleset ( i ) ;
  668. tsItem->streamType=NONE;
  669. @@ -561,7 +561,7 @@
  670. m_playbackOptions->fillTitleList();
  671. m_langSelect->fillLvLanguages();
  672. listView1->setSortingEnabled ( true );
  673. - changeStatusbar ( i18n ( "Ready" ),sbMessage );
  674. + changeStatusbar ( i18n( "Ready" ),sbMessage );
  675. emit SelectionChanged ( dvd,withMenus() );
  676. this->setEnabled ( true );
  677. @@ -606,18 +606,18 @@
  678. void k9Main::addChapters ( QTreeWidgetItem *_parent,k9DVDTitle *_title ) {
  679. LvItem *chapter = new LvItem ( _parent,CHAPTER );
  680. - chapter->setText ( 0, i18n ( "chapters" ) );
  681. + chapter->setText ( 0, i18n( "chapters" ) );
  682. chapter->setExpanded ( false );
  683. chapter->setIcon ( 0,pxChapter );
  684. int ch=0;
  685. for ( int i=0;i< _title->getchapterCount();i++ ) {
  686. ckLvItem *it =new ckLvItem ( chapter,this,CHAPTER );
  687. - it->setText ( 0,i18n ( "chapter %1").arg(++ch ) );
  688. + it->setText ( 0,i18n( "chapter %1",++ch ) );
  689. QString s;
  690. s=QString ( "%1" ).arg ( ( double ) ( _title->getChapter ( i )->getsectors() ) /512,0,'f',2 );
  691. - it->setText ( 1,i18n ( "%1 MB").arg(s ) );
  692. + it->setText ( 1,i18n( "%1 MB",s ) );
  693. it->setTextAlignment ( 1,Qt::AlignRight | Qt::AlignVCenter);
  694. it->setTextAlignment ( 2,Qt::AlignRight | Qt::AlignVCenter);
  695. @@ -631,13 +631,13 @@
  696. k9DVDTitle *title2=_title->getTitles().at ( j );
  697. for ( int i=0;i< title2->getchapterCount();i++ ) {
  698. ckLvItem *it =new ckLvItem ( chapter,this,CHAPTER );
  699. - it->setText ( 0,i18n ( "chapter %1").arg(++ch ) );
  700. + it->setText ( 0,i18n( "chapter %1",++ch ) );
  701. it->streamType=CHAP;
  702. it->obj=title2->getChapter ( i );
  703. QString s;
  704. s=QString ( "%1" ).arg ( ( double ) ( title2->getChapter ( i )->getsectors() ) /512,0,'f',2 );
  705. - it->setText ( 1,i18n ( "%1 MB").arg(s ) );
  706. + it->setText ( 1,i18n( "%1 MB",s ) );
  707. it->setTextAlignment ( 1,Qt::AlignRight | Qt::AlignVCenter );
  708. it->setTextAlignment ( 2,Qt::AlignRight | Qt::AlignVCenter );
  709. @@ -672,7 +672,7 @@
  710. itemTrack->setIcon ( col1,SmallIcon ( "title" ) );
  711. c.sprintf ( "%.2f ", track->gettotalsize_mb() );
  712. - itemTrack->setText ( col2,c+i18n ( "MB" ) );
  713. + itemTrack->setText ( col2,c+i18n( "MB" ) );
  714. itemTrack->setText (col4,track->gettotallength().toString ( "h:mm:ss" ));
  715. itemTrack->setTextAlignment ( col2,Qt::AlignRight|Qt::AlignVCenter );
  716. itemTrack->setTextAlignment ( col4,Qt::AlignRight|Qt::AlignVCenter );
  717. @@ -690,20 +690,20 @@
  718. video->setIcon ( 0,SmallIcon ( "video" ) );
  719. addListItem ( track,video,VID );
  720. video->setExpanded ( false );
  721. - c=i18n ( "video %1 ").arg(track->getformat() );
  722. + c=i18n( "video %1 ",track->getformat() );
  723. c.append ( " - " + track->getaspectRatio() );
  724. video->setText ( col1, c );
  725. if ( track->gettotalvideosize_mb() ) {
  726. c.sprintf ( "%.2f ", track->gettotalvideosize_mb() );
  727. - video->setText ( col2,c +i18n ( "MB" ) );
  728. + video->setText ( col2,c +i18n( "MB" ) );
  729. video->setTextAlignment ( col2,Qt::AlignRight );
  730. }
  731. video->obj=track;
  732. for ( i=0;i< track->getaudioStreamCount();i++ ) {
  733. l_auds=track->getaudioStream ( i );
  734. - c=i18n ( "audio %1 ").arg(i+1 );
  735. + c=i18n( "audio %1 ",i+1 );
  736. c.append ( l_auds->getlanguage() + " " +l_auds->getformat() +" " );
  737. ch.sprintf ( "%dch ",l_auds->getchannels() );
  738. c.append ( ch+l_auds->getfrequency() +" "+l_auds->getquantization() );
  739. @@ -717,7 +717,7 @@
  740. item->setText ( col1, c );
  741. if ( l_auds->getsize_mb() ) {
  742. c.sprintf ( "%.2f ", l_auds->getsize_mb());
  743. - item->setText ( col2,c +i18n ( "MB" ) );
  744. + item->setText ( col2,c +i18n( "MB" ) );
  745. item->setTextAlignment ( col2,Qt::AlignRight );
  746. }
  747. item->setText ( col3,l_auds->getcontent() );
  748. @@ -727,7 +727,7 @@
  749. }
  750. for ( i=0;i< track->getsubPictureCount();i++ ) {
  751. l_sub=track->getsubtitle ( i );
  752. - c=i18n ( "subpicture %1 ").arg(i+1 );
  753. + c=i18n( "subpicture %1 ",i+1 );
  754. c.append ( l_sub->getlanguage() );
  755. ckLvItem * item = new ckLvItem ( itemTrack,this,STREAM );
  756. @@ -738,7 +738,7 @@
  757. item->setText ( col1, c );
  758. if ( l_sub->getsize_mb() ) {
  759. c.sprintf ( "%.2f ", l_sub->getsize_mb());
  760. - item->setText ( col2,c +i18n ( "MB" ) );
  761. + item->setText ( col2,c +i18n( "MB" ) );
  762. item->setTextAlignment ( col2,Qt::AlignRight );
  763. }
  764. item->setText ( col3, l_sub->getcontent() );
  765. @@ -1207,7 +1207,7 @@
  766. execCopy.setDvd ( dvd );
  767. execCopy.setPath(Ui_MainDlg.urOutput->url().path());
  768. execCopy.CreateMP4();
  769. - changeStatusbar ( i18n ( "Ready" ) ,sbMessage );
  770. + changeStatusbar ( i18n( "Ready" ) ,sbMessage );
  771. }
  772. @@ -1216,7 +1216,7 @@
  773. execCopy.setDvd ( dvd );
  774. execCopy.setPath(Ui_MainDlg.urOutput->url().path());
  775. execCopy.extractAudio();
  776. - changeStatusbar ( i18n ( "Ready" ) ,sbMessage );
  777. + changeStatusbar ( i18n( "Ready" ) ,sbMessage );
  778. }
  779. @@ -1226,7 +1226,7 @@
  780. execCopy.setDvd ( dvd );
  781. execCopy.setPath(Ui_MainDlg.urOutput->url().path());
  782. execCopy.extractMPEG2();
  783. - changeStatusbar ( i18n ( "Ready" ) ,sbMessage );
  784. + changeStatusbar ( i18n( "Ready" ) ,sbMessage );
  785. }
  786. @@ -1365,7 +1365,7 @@
  787. if ( drive !=NULL ) {
  788. QList <int>list=drive->getWriteSpeeds();
  789. Ui_MainDlg.cbBurnSpeed->clear();
  790. - Ui_MainDlg.cbBurnSpeed->addItem ( i18n ( "default" ) );
  791. + Ui_MainDlg.cbBurnSpeed->addItem ( i18n( "default" ) );
  792. foreach ( int speed,list ) {
  793. Ui_MainDlg.cbBurnSpeed->addItem ( QString::number ( ( double ) ( speed ) /1385 ) );
  794. }
  795. @@ -1389,7 +1389,7 @@
  796. void k9Main::bInputOpenClick() {
  797. - QString result=k9Dialogs::getOpenFileName ( QDir::homePath(),"*.iso", 0,i18n ( "Open ISO Image" ) );
  798. + QString result=k9Dialogs::getOpenFileName ( QDir::homePath(),"*.iso", 0,i18n( "Open ISO Image" ) );
  799. if ( result!="" ) {
  800. k9Tools::setComboText ( Ui_MainDlg.cbInputDev,result );
  801. Open();
  802. @@ -1482,7 +1482,7 @@
  803. }
  804. else {
  805. changeStatusbar ( QString::number ( dbfactor,'f',2 ),sbFactor );
  806. - changeStatusbar ( i18n("%1 MB").arg(QString::number ((double)sizeSelected/512.,'f',2)),sbSelSize);
  807. + changeStatusbar ( i18n("%1 MB",QString::number ((double)sizeSelected/512.,'f',2)),sbSelSize);
  808. }
  809. emit SelectionChanged ( dvd,withMenus() );
  810. m_mutex.unlock();
  811. diff -Naur k9copy-work/src/main/k9titlefactor.cpp k9copy/src/main/k9titlefactor.cpp
  812. --- k9copy-work/src/main/k9titlefactor.cpp 2014-09-29 11:00:12.000000000 -0400
  813. +++ k9copy/src/main/k9titlefactor.cpp 2020-12-23 23:51:35.909155787 -0500
  814. @@ -60,7 +60,7 @@
  815. }
  816. double size;
  817. size =m_current->getChaptersSize_mb(true) / getFactor();
  818. - Ui_titleFactor.lTargetSize->setText(i18n("size : %1 MB").arg(size ));
  819. + Ui_titleFactor.lTargetSize->setText(i18n("size : %1 MB",size ));
  820. }
  821. }
  822. @@ -97,7 +97,7 @@
  823. Ui_titleFactor.tFactor->setText(QString("%1").arg(getFactor(),4,'f',2));
  824. size =m_current->getChaptersSize_mb(true) / getFactor();
  825. }
  826. - Ui_titleFactor.lTargetSize->setText(i18n("size : %1 MB").arg(size ));
  827. + Ui_titleFactor.lTargetSize->setText(i18n("size : %1 MB",size ));
  828. }
  829. @@ -118,7 +118,7 @@
  830. Ui_titleFactor.gbTitle->setChecked(m_current->getforceFactor());
  831. m_updating=false;
  832. - Ui_titleFactor.lbTitle->setText(i18n("Shrink Factor for %1").arg(m_current->getname()));
  833. + Ui_titleFactor.lbTitle->setText(i18n("Shrink Factor for %1",m_current->getname()));
  834. double size;
  835. if (m_current->getforceFactor()) {
  836. Ui_titleFactor.slFactor->setValue(m_current->getfactor()*100.0);
  837. @@ -131,7 +131,7 @@
  838. Ui_titleFactor.slFactor->setMinimum(100);
  839. size =m_current->getChaptersSize_mb(true) / getFactor();
  840. }
  841. - Ui_titleFactor.lTargetSize->setText(i18n("size : %1 MB").arg(size ));
  842. + Ui_titleFactor.lTargetSize->setText(i18n("size : %1 MB",size ));
  843. }
  844. diff -Naur k9copy-work/src/mplayer/k9mplayer.cpp k9copy/src/mplayer/k9mplayer.cpp
  845. --- k9copy-work/src/mplayer/k9mplayer.cpp 2014-09-29 11:00:12.000000000 -0400
  846. +++ k9copy/src/mplayer/k9mplayer.cpp 2020-12-23 23:48:01.709471987 -0500
  847. @@ -174,7 +174,7 @@
  848. qDebug() << m_process->debug();
  849. if (!m_process->start()) {
  850. - k9Dialogs::error (i18n("Unable to run %1").arg("mplayer") , i18n("Preview"));
  851. + k9Dialogs::error (i18n("Unable to run %1","mplayer") , i18n("Preview"));
  852. }
  853. m_canwrite=TRUE;
  854. diff -Naur k9copy-work/src/player/k9play.cpp k9copy/src/player/k9play.cpp
  855. --- k9copy-work/src/player/k9play.cpp 2020-12-23 23:47:42.379321457 -0500
  856. +++ k9copy/src/player/k9play.cpp 2020-12-23 23:48:01.709471987 -0500
  857. @@ -366,7 +366,7 @@
  858. /* set read ahead cache usage */
  859. if (dvdnav_set_readahead_flag(dvdnav, DVD_READ_CACHE) != DVDNAV_STATUS_OK) {
  860. writeOutput( QString("ERR:Error on dvdnav_set_readahead_flag: %1\n").arg(dvdnav_err_to_string(dvdnav)));
  861. - emit sigError(i18n("Error on dvdnav_set_readahead_flag: %1").arg(dvdnav_err_to_string(dvdnav)));
  862. + emit sigError(i18n("Error on dvdnav_set_readahead_flag: %1",dvdnav_err_to_string(dvdnav)));
  863. end();
  864. return;
  865. }