From 4a0ac9d1834658d325704a9fbb1a673f5935230e Mon Sep 17 00:00:00 2001 From: Chusslove Illich Date: Mon, 10 Apr 2006 11:45:42 +0000 Subject: [PATCH] Conversion to new i18n API (see KDE4PORTING.html->I18N->i18n calls). svn path=/trunk/KDE/kdegraphics/kviewshell/plugins/dvi/; revision=528186 --- TeXFontDefinition.cpp | 6 +++--- TeXFont_PFB.cpp | 16 ++++++++-------- TeXFont_PK.cpp | 16 ++++++++-------- dviFile.cpp | 6 +++--- dviRenderer.cpp | 12 ++++++------ dviRenderer_draw.cpp | 4 ++-- dviRenderer_prescan.cpp | 14 +++++++------- dviWidget.cpp | 2 +- dviexport.cpp | 8 ++++---- dvisourceeditor.cpp | 4 ++-- fontpool.cpp | 2 +- kdvi_multipage.cpp | 4 ++-- special.cpp | 16 ++++++++-------- vf.cpp | 2 +- 14 files changed, 56 insertions(+), 56 deletions(-) diff --git a/TeXFontDefinition.cpp b/TeXFontDefinition.cpp index 72e7626a1..d0f63f2b7 100644 --- a/TeXFontDefinition.cpp +++ b/TeXFontDefinition.cpp @@ -104,7 +104,7 @@ void TeXFontDefinition::fontNameReceiver(const QString& fname) QString filename_test(font_pool->getExtraSearchPath() + "/" + filename); file = fopen( QFile::encodeName(filename_test), "r"); if (file == 0) { - kError(kvs::dvi) << i18n("Cannot find font %1, file %2.").arg(fontname).arg(filename) << endl; + kError(kvs::dvi) << i18n("Cannot find font %1, file %2.", fontname, filename) << endl; return; } else filename = filename_test; @@ -120,7 +120,7 @@ void TeXFontDefinition::fontNameReceiver(const QString& fname) font = new TeXFont_PK(this); set_char_p = &dviRenderer::set_char; if ((checksum != 0) && (checksum != font->checksum)) - kWarning(kvs::dvi) << i18n("Checksum mismatch for font file %1").arg(filename) << endl; + kWarning(kvs::dvi) << i18n("Checksum mismatch for font file %1", filename) << endl; fontTypeName = "TeX PK"; return; } @@ -168,7 +168,7 @@ void TeXFontDefinition::fontNameReceiver(const QString& fname) #else // If we don't have the FreeType library, we should never have // reached this point. Complain, and leave this font blank - kError(kvs::dvi) << i18n("Cannot recognize format for font file %1").arg(filename) << endl; + kError(kvs::dvi) << i18n("Cannot recognize format for font file %1", filename) << endl; #endif } diff --git a/TeXFont_PFB.cpp b/TeXFont_PFB.cpp index 4d1c48404..98c443dfe 100644 --- a/TeXFont_PFB.cpp +++ b/TeXFont_PFB.cpp @@ -39,13 +39,13 @@ TeXFont_PFB::TeXFont_PFB(TeXFontDefinition *parent, fontEncoding *enc, double sl int error = FT_New_Face( parent->font_pool->FreeType_library, parent->filename.toLocal8Bit(), 0, &face ); if ( error == FT_Err_Unknown_File_Format ) { - errorMessage = i18n("The font file %1 could be opened and read, but its font format is unsupported.").arg(parent->filename); + errorMessage = i18n("The font file %1 could be opened and read, but its font format is unsupported.", parent->filename); kError(kvs::dvi) << errorMessage << endl; fatalErrorInFontLoading = true; return; } else if ( error ) { - errorMessage = i18n("The font file %1 is broken, or it could not be opened or read.").arg(parent->filename); + errorMessage = i18n("The font file %1 is broken, or it could not be opened or read.", parent->filename); kError(kvs::dvi) << errorMessage << endl; fatalErrorInFontLoading = true; return; @@ -166,7 +166,7 @@ glyph* TeXFont_PFB::getGlyph(quint16 ch, bool generateCharacterPixmap, const QCo long int characterSize_in_printers_points_by_64 = (long int)((64.0*72.0*parent->scaled_size_in_DVI_units*parent->font_pool->getCMperDVIunit())/2.54 + 0.5 ); error = FT_Set_Char_Size(face, 0, characterSize_in_printers_points_by_64, res, res ); if (error) { - QString msg = i18n("FreeType reported an error when setting the character size for font file %1.").arg(parent->filename); + QString msg = i18n("FreeType reported an error when setting the character size for font file %1.", parent->filename); if (errorMessage.isEmpty()) errorMessage = msg; kError(kvs::dvi) << msg << endl; @@ -182,7 +182,7 @@ glyph* TeXFont_PFB::getGlyph(quint16 ch, bool generateCharacterPixmap, const QCo error = FT_Load_Glyph(face, charMap[ch], FT_LOAD_NO_HINTING ); if (error) { - QString msg = i18n("FreeType is unable to load glyph #%1 from font file %2.").arg(ch).arg(parent->filename); + QString msg = i18n("FreeType is unable to load glyph #%1 from font file %2.", ch, parent->filename); if (errorMessage.isEmpty()) errorMessage = msg; kError(kvs::dvi) << msg << endl; @@ -194,7 +194,7 @@ glyph* TeXFont_PFB::getGlyph(quint16 ch, bool generateCharacterPixmap, const QCo // convert to an anti-aliased bitmap error = FT_Render_Glyph( face->glyph, ft_render_mode_normal ); if (error) { - QString msg = i18n("FreeType is unable to render glyph #%1 from font file %2.").arg(ch).arg(parent->filename); + QString msg = i18n("FreeType is unable to render glyph #%1 from font file %2.", ch, parent->filename); if (errorMessage.isEmpty()) errorMessage = msg; kError(kvs::dvi) << msg << endl; @@ -207,8 +207,8 @@ glyph* TeXFont_PFB::getGlyph(quint16 ch, bool generateCharacterPixmap, const QCo if ((slot->bitmap.width == 0) || (slot->bitmap.rows == 0)) { if (errorMessage.isEmpty()) - errorMessage = i18n("Glyph #%1 is empty.").arg(ch); - kError(kvs::dvi) << i18n("Glyph #%1 from font file %2 is empty.").arg(ch).arg(parent->filename) << endl; + errorMessage = i18n("Glyph #%1 is empty.", ch); + kError(kvs::dvi) << i18n("Glyph #%1 from font file %2 is empty.", ch, parent->filename) << endl; g->shrunkenCharacter = QImage(15, 15 , QImage::Format_RGB32); g->shrunkenCharacter.fill(qRgb(255, 0, 0)); g->x2 = 0; @@ -277,7 +277,7 @@ glyph* TeXFont_PFB::getGlyph(quint16 ch, bool generateCharacterPixmap, const QCo if (g->dvi_advance_in_units_of_design_size_by_2e20 == 0) { int error = FT_Load_Glyph(face, charMap[ch], FT_LOAD_NO_SCALE); if (error) { - QString msg = i18n("FreeType is unable to load metric for glyph #%1 from font file %2.").arg(ch).arg(parent->filename); + QString msg = i18n("FreeType is unable to load metric for glyph #%1 from font file %2.", ch, parent->filename); if (errorMessage.isEmpty()) errorMessage = msg; kError(kvs::dvi) << msg << endl; diff --git a/TeXFont_PK.cpp b/TeXFont_PK.cpp index e1f095894..5d4ae6643 100644 --- a/TeXFont_PK.cpp +++ b/TeXFont_PK.cpp @@ -86,7 +86,7 @@ TeXFont_PK::TeXFont_PK(TeXFontDefinition *parent) characterBitmaps[i] = 0; file = fopen(QFile::encodeName(parent->filename), "r"); if (file == 0) - kError(kvs::dvi) << i18n("Cannot open font file %1.").arg(parent->filename) << endl; + kError(kvs::dvi) << i18n("Cannot open font file %1.", parent->filename) << endl; #ifdef DEBUG_PK else kDebug(kvs::dvi) << "TeXFont_PK::TeXFont_PK(): file opened successfully" << endl; @@ -131,7 +131,7 @@ glyph* TeXFont_PK::getGlyph(quint16 ch, bool generateCharacterPixmap, const QCol // If the character is not defined in the PK file, mark the // character as missing, and print an error message if (g->addr == 0) { - kError(kvs::dvi) << i18n("TexFont_PK::operator[]: Character %1 not defined in font %2").arg(ch).arg(parent->filename) << endl; + kError(kvs::dvi) << i18n("TexFont_PK::operator[]: Character %1 not defined in font %2", ch, parent->filename) << endl; g->addr = -1; return g; } @@ -448,7 +448,7 @@ void TeXFont_PK::PK_skip_specials() case PK_NOOP : break; default : - oops(i18n("Unexpected %1 in PK file %2").arg(PK_flag_byte).arg(parent->filename) ); + oops(i18n("Unexpected %1 in PK file %2", PK_flag_byte, parent->filename) ); break; } } @@ -515,7 +515,7 @@ void TeXFont_PK::read_PK_char(unsigned int ch) w = num(fp, n); h = num(fp, n); if (w > 0x7fff || h > 0x7fff) - oops(i18n("The character %1 is too large in file %2").arg(ch).arg(parent->filename)); + oops(i18n("The character %1 is too large in file %2", ch, parent->filename)); characterBitmaps[ch]->w = w; characterBitmaps[ch]->h = h; } @@ -620,9 +620,9 @@ void TeXFont_PK::read_PK_char(unsigned int ch) paint_switch = 1 - paint_switch; } if (cp != ((quint32 *) (characterBitmaps[ch]->bits + bytes_wide * characterBitmaps[ch]->h))) - oops(i18n("Wrong number of bits stored: char. %1, font %2").arg(ch).arg(parent->filename)); + oops(i18n("Wrong number of bits stored: char. %1, font %2", ch, parent->filename)); if (rows_left != 0 || h_bit != characterBitmaps[ch]->w) - oops(i18n("Bad pk file (%1), too many bits").arg(parent->filename)); + oops(i18n("Bad pk file (%1), too many bits", parent->filename)); } // The data in the bitmap is now in the processor's bit order, @@ -706,9 +706,9 @@ void TeXFont_PK::read_PK_char(unsigned int ch) paint_switch = 1 - paint_switch; } if (cp != ((quint32 *) (characterBitmaps[ch]->bits + bytes_wide * characterBitmaps[ch]->h))) - oops(i18n("Wrong number of bits stored: char. %1, font %2").arg(ch).arg(parent->filename)); + oops(i18n("Wrong number of bits stored: char. %1, font %2", ch, parent->filename)); if (rows_left != 0 || h_bit != characterBitmaps[ch]->w) - oops(i18n("Bad pk file (%1), too many bits").arg(parent->filename)); + oops(i18n("Bad pk file (%1), too many bits", parent->filename)); } } // endif: big or small Endian? } diff --git a/dviFile.cpp b/dviFile.cpp index c9e644805..b97c766af 100644 --- a/dviFile.cpp +++ b/dviFile.cpp @@ -253,7 +253,7 @@ void dvifile::prepare_pages() while (j > 0) { command_pointer = dvi_Data() + page_offset[j--]; if (readUINT8() != BOP) { - errorMsg = i18n("The page %1 does not start with the BOP command.").arg(j+1); + errorMsg = i18n("The page %1 does not start with the BOP command.", j+1); return; } command_pointer += 10 * 4; @@ -395,7 +395,7 @@ QString dvifile::convertPDFtoPS(const QString &PDFFilename, QString *converrorms "contained in distributions of the ghostscript PostScript interpreter system. If " "ghostscipt is not installed on your system, you could install it now. " "If you are sure that ghostscript is installed, please try to use pdf2ps " - "from the command line to check if it really works.

PATH: %2

").arg(PDFFilename).arg(getenv("PATH")); + "from the command line to check if it really works.

PATH: %2

", PDFFilename, getenv("PATH")); have_complainedAboutMissingPDF2PS = true; } return QString::null; @@ -414,7 +414,7 @@ QString dvifile::convertPDFtoPS(const QString &PDFFilename, QString *converrorms "document will therefore not be displayed.

" "

Possible reason: The file %1 might be broken, or might not be a PDF-file at all. " "This is the output of the pdf2ps program that KDVI used:

" - "

%2

").arg(PDFFilename).arg(output); + "

%2

", PDFFilename, output); } return QString::null; } diff --git a/dviRenderer.cpp b/dviRenderer.cpp index c236cc3f1..2d982fee8 100644 --- a/dviRenderer.cpp +++ b/dviRenderer.cpp @@ -412,7 +412,7 @@ bool dviRenderer::setFile(const QString &fname, const KUrl &base) if (!fi.exists() || fi.isDir()) { KMessageBox::error( parentWidget, i18n("File error. The specified file '%1' does not exist. " - "KDVI already tried to add the ending '.dvi'.").arg(filename), + "KDVI already tried to add the ending '.dvi'.", filename), i18n("File Error!")); return false; } @@ -425,9 +425,9 @@ bool dviRenderer::setFile(const QString &fname, const KUrl &base) if (mimetype != "application/x-dvi") { KMessageBox::sorry( parentWidget, i18n( "Could not open file %1 which has " - "type %2. KDVI can only load DVI (.dvi) files." ) - .arg( fname ) - .arg( mimetype ) ); + "type %2. KDVI can only load DVI (.dvi) files." , + fname , + mimetype ) ); return false; } @@ -606,7 +606,7 @@ Anchor dviRenderer::parseReference(const QString &reference) "line %1 in the TeX-file %2. It seems, however, that the DVI file " "does not contain the necessary source file information. " "We refer to the manual of KDVI for a detailed explanation on how to include this " - "information. Press the F1 key to open the manual.").arg(refLineNumber).arg(refFileName), + "information. Press the F1 key to open the manual.", refLineNumber, refFileName), i18n("Could Not Find Reference")); mutex.unlock(); return Anchor(); @@ -646,7 +646,7 @@ Anchor dviRenderer::parseReference(const QString &reference) } else if (anchorForRefFileFound == false) KMessageBox::sorry(parentWidget, i18n("KDVI was not able to locate the place in the DVI file which corresponds to " - "line %1 in the TeX-file %2.").arg(refLineNumber).arg(refFileName), + "line %1 in the TeX-file %2.", refLineNumber, refFileName), i18n( "Could Not Find Reference" )); else { mutex.unlock(); diff --git a/dviRenderer_draw.cpp b/dviRenderer_draw.cpp index ac5c624b4..52498c141 100644 --- a/dviRenderer_draw.cpp +++ b/dviRenderer_draw.cpp @@ -284,7 +284,7 @@ void dviRenderer::draw_part(double current_dimconv, bool is_vfmacro) if (FNTNUM0 <= ch && ch <= (unsigned char) (FNTNUM0 + 63)) { currinf.fontp = currinf.fonttable->find(ch - FNTNUM0); if (currinf.fontp == NULL) { - errorMsg = i18n("The DVI code referred to font #%1, which was not previously defined.").arg(ch - FNTNUM0); + errorMsg = i18n("The DVI code referred to font #%1, which was not previously defined.", ch - FNTNUM0); return; } currinf.set_char_p = currinf.fontp->set_char_p; @@ -559,7 +559,7 @@ void dviRenderer::draw_part(double current_dimconv, bool is_vfmacro) break; default: - errorMsg = i18n("The unknown op-code %1 was encountered.").arg(ch); + errorMsg = i18n("The unknown op-code %1 was encountered.", ch); return; } /* end switch*/ } /* end else (ch not a SETCHAR or FNTNUM) */ diff --git a/dviRenderer_prescan.cpp b/dviRenderer_prescan.cpp index e7e2234e5..884451acd 100644 --- a/dviRenderer_prescan.cpp +++ b/dviRenderer_prescan.cpp @@ -85,7 +85,7 @@ void dviRenderer::prescan_embedPS(char *cp, quint8 *beginningOfSpecialCommand) QString originalFName = EPSfilename; - embedPS_progress->setLabel(i18n("Embedding %1").arg(EPSfilename)); + embedPS_progress->setLabel(i18n("Embedding %1", EPSfilename)); qApp->processEvents(); // If the EPSfilename really points to a PDF file, convert that file now. @@ -100,9 +100,9 @@ void dviRenderer::prescan_embedPS(char *cp, quint8 *beginningOfSpecialCommand) if ((dviFile->page_offset[page] <= currentOffset) && (currentOffset <= dviFile->page_offset[page+1])) break; if (is_pdf_file) - errorMsg += i18n("Page %1: The PDF file %2 could not be converted to PostScript.
").arg(page+1).arg(originalFName); + errorMsg += i18n("Page %1: The PDF file %2 could not be converted to PostScript.
", page+1, originalFName); else - errorMsg += i18n("Page %1: The PostScript file %2 could not be found.
").arg(page+1).arg(originalFName); + errorMsg += i18n("Page %1: The PostScript file %2 could not be found.
", page+1, originalFName); embedPS_progress->progressBar()->advance(1); qApp->processEvents(); return; @@ -251,7 +251,7 @@ void dviRenderer::prescan_ParsePapersizeSpecial(const QString& _cp) dviFile->suggestedPageSize = new pageSize; dviFile->suggestedPageSize->setPageSize(cp); } else - printErrorMsgForSpecials(i18n("The papersize data '%1' could not be parsed.").arg(cp)); + printErrorMsgForSpecials(i18n("The papersize data '%1' could not be parsed.", cp)); return; } @@ -433,13 +433,13 @@ void dviRenderer::prescan_ParsePSFileSpecial(const QString& cp) if (ending == "pdf") { QString convErrorMsg; QString oEPSfilename = EPSfilename; - emit setStatusBarText( i18n("Converting PDF-file %1...").arg(EPSfilename) ); + emit setStatusBarText( i18n("Converting PDF-file %1...", EPSfilename) ); EPSfilename = dviFile->convertPDFtoPS(EPSfilename, &convErrorMsg); emit setStatusBarText( QString::null ); if (convErrorMsg.isEmpty() != true) { KMessageBox::detailedError(parentWidget, i18n("File conversion error! KDVI was not able to convert the external " - "PDF-file %1 into PostScript. Expect missing graphics or graphic errors.").arg(oEPSfilename), + "PDF-file %1 into PostScript. Expect missing graphics or graphic errors.", oEPSfilename), convErrorMsg, i18n("PDF/PS conversion error")); return; } @@ -644,7 +644,7 @@ void dviRenderer::prescan(parseSpecials specialParser) if (FNTNUM0 <= ch && ch <= (unsigned char) (FNTNUM0 + 63)) { currinf.fontp = currinf.fonttable->find(ch - FNTNUM0); if (currinf.fontp == NULL) { - errorMsg = i18n("The DVI code referred to font #%1, which was not previously defined.").arg(ch - FNTNUM0); + errorMsg = i18n("The DVI code referred to font #%1, which was not previously defined.", ch - FNTNUM0); return; } currinf.set_char_p = currinf.fontp->set_char_p; diff --git a/dviWidget.cpp b/dviWidget.cpp index c41ca6df2..e5a47c698 100644 --- a/dviWidget.cpp +++ b/dviWidget.cpp @@ -108,7 +108,7 @@ void DVIWidget::mouseMoveEvent(QMouseEvent* e) if (cp[i].isDigit() == false) break; - emit setStatusBarText( i18n("line %1 of %2").arg(cp.left(i)).arg(cp.mid(i).simplified()) ); + emit setStatusBarText( i18n("line %1 of %2", cp.left(i), cp.mid(i).simplified()) ); return; } } diff --git a/dviexport.cpp b/dviexport.cpp index 88af07c6c..175fbcc52 100644 --- a/dviexport.cpp +++ b/dviexport.cpp @@ -277,7 +277,7 @@ DVIExportToPDF::DVIExportToPDF(dviRenderer& parent, QWidget* parent_widget) if (!output.exists()) { const int result = KMessageBox::warningContinueCancel(parent_widget, - i18n("The file %1\nexists. Do you want to overwrite that file?").arg(output_name), + i18n("The file %1\nexists. Do you want to overwrite that file?", output_name), i18n("Overwrite File"), i18n("Overwrite")); if (result == KMessageBox::Cancel) @@ -293,7 +293,7 @@ DVIExportToPDF::DVIExportToPDF(dviRenderer& parent, QWidget* parent_widget) i18n("Waiting for dvipdfm to finish..."), i18n("dvipdfm progress dialog")); - parent.update_info_dialog(i18n("Export: %1 to PDF").arg(dvi.filename), + parent.update_info_dialog(i18n("Export: %1 to PDF", dvi.filename), true); start("dvipdfm", @@ -362,7 +362,7 @@ DVIExportToPS::DVIExportToPS(dviRenderer& parent, if (!output.exists()) { const int result = KMessageBox::warningContinueCancel(parent_widget, - i18n("The file %1\nexists. Do you want to overwrite that file?").arg(output_name_), + i18n("The file %1\nexists. Do you want to overwrite that file?", output_name_), i18n("Overwrite File"), i18n("Overwrite")); if (result == KMessageBox::Cancel) @@ -448,7 +448,7 @@ DVIExportToPS::DVIExportToPS(dviRenderer& parent, i18n("Waiting for dvips to finish..."), i18n("dvips progress dialog")); - parent.update_info_dialog(i18n("Export: %1 to PostScript").arg(dvi.filename), + parent.update_info_dialog(i18n("Export: %1 to PostScript", dvi.filename), true); QStringList args; diff --git a/dvisourceeditor.cpp b/dvisourceeditor.cpp index b4bd0de53..49cd6317f 100644 --- a/dvisourceeditor.cpp +++ b/dvisourceeditor.cpp @@ -51,7 +51,7 @@ DVISourceEditor::DVISourceEditor(dviRenderer& parent, { KMessageBox::sorry(parentWidget, QString("") + i18n("The DVI-file refers to the TeX-file " - "%1 which could not be found.").arg(KProcess::quote(TeXfile)) + + "%1 which could not be found.", KProcess::quote(TeXfile)) + QString(""), i18n( "Could Not Find File" )); return; @@ -94,7 +94,7 @@ DVISourceEditor::DVISourceEditor(dviRenderer& parent, "for inverse search, reported an error. You might wish to look at the document info " "dialog which you will find in the File-Menu for a precise error report. The " "manual for KDVI contains a detailed explanation how to set up your editor for use with KDVI, " - "and a list of common problems.").arg(command); + "and a list of common problems.", command); parent.update_info_dialog(i18n("Starting the editor..."), true); diff --git a/fontpool.cpp b/fontpool.cpp index 738716bd4..8aaf503e1 100644 --- a/fontpool.cpp +++ b/fontpool.cpp @@ -562,7 +562,7 @@ void fontPool::mf_output_receiver() QString dpi = startLine.mid(secondblank+1,lastblank-secondblank-1); progress.show(); - progress.increaseNumSteps( i18n("Currently generating %1 at %2 dpi").arg(fontName).arg(dpi) ); + progress.increaseNumSteps( i18n("Currently generating %1 at %2 dpi", fontName, dpi) ); } MetafontOutput = MetafontOutput.remove(0,numleft+1); } diff --git a/kdvi_multipage.cpp b/kdvi_multipage.cpp index 29a0a5ea3..992aaea89 100644 --- a/kdvi_multipage.cpp +++ b/kdvi_multipage.cpp @@ -142,7 +142,7 @@ bool KDVIMultiPage::slotSave(const QString &fileName) bool r = DVIRenderer.dviFile->saveAs(fileName); if (r == false) - KMessageBox::error(parentWdg, i18n("Error saving the document to the file %1. The document is not saved.").arg(fileName), + KMessageBox::error(parentWdg, i18n("Error saving the document to the file %1. The document is not saved.", fileName), i18n("Error saving document")); return r; } @@ -203,7 +203,7 @@ void KDVIMultiPage::print() // Show the printer options dialog. Return immediately if the user // aborts. - if (!printer->setup(parentWdg, i18n("Print %1").arg(m_file.section('/', -1)) )) + if (!printer->setup(parentWdg, i18n("Print %1", m_file.section('/', -1)) )) return; // This funny method call is necessary for the KPrinter to return diff --git a/special.cpp b/special.cpp index 83cd6c841..143a17ae8 100644 --- a/special.cpp +++ b/special.cpp @@ -216,8 +216,8 @@ void dviRenderer::color_special(const QString& _cp) if (command == "pop") { // Take color off the stack if (colorStack.isEmpty()) - printErrorMsgForSpecials( i18n("Error in DVIfile '%1', page %2. Color pop command issued when the color stack is empty." ). - arg(dviFile->filename).arg(current_page)); + printErrorMsgForSpecials( i18n("Error in DVIfile '%1', page %2. Color pop command issued when the color stack is empty." , + dviFile->filename, current_page)); else colorStack.pop(); return; @@ -302,8 +302,8 @@ void parse_special_argument(const QString& strg, const char* argument_name, int* else // Maybe we should open a dialog here. kError(kvs::dvi) << i18n("Malformed parameter in the epsf special command.\n" - "Expected a float to follow %1 in %2") - .arg(argument_name).arg(strg) << endl; + "Expected a float to follow %1 in %2", + argument_name, strg) << endl; } } @@ -427,7 +427,7 @@ void dviRenderer::epsf_special(const QString& cp) foreGroundPainter->drawText (bbox, (int)(Qt::AlignCenter), EPSfilename, -1); else foreGroundPainter->drawText (bbox, (int)(Qt::AlignCenter), - i18n("File not found: \n %1").arg(EPSfilename_orig), -1); + i18n("File not found: \n %1", EPSfilename_orig), -1); foreGroundPainter->restore(); } @@ -673,8 +673,8 @@ void dviRenderer::applicationDoSpecial(char *cp) foreGroundPainter->rotate(-angle); foreGroundPainter->translate(-x,-y); } else - printErrorMsgForSpecials( i18n("Error in DVIfile '%1', page %2. Could not interpret angle in text rotation special." ). - arg(dviFile->filename).arg(current_page)); + printErrorMsgForSpecials( i18n("Error in DVIfile '%1', page %2. Could not interpret angle in text rotation special." , + dviFile->filename, current_page)); } // The graphicx package marks the end of rotated text with this @@ -696,6 +696,6 @@ void dviRenderer::applicationDoSpecial(char *cp) (strncasecmp(cp, "background", 10) == 0) ) return; - printErrorMsgForSpecials(i18n("The special command '%1' is not implemented.").arg(special_command)); + printErrorMsgForSpecials(i18n("The special command '%1' is not implemented.", special_command)); return; } diff --git a/vf.cpp b/vf.cpp index 63ea160d9..47aec0ed1 100644 --- a/vf.cpp +++ b/vf.cpp @@ -179,7 +179,7 @@ void TeXFontDefinition::read_VF_index() } } if (cmnd != POST) - oops(i18n("Wrong command byte found in VF macro list: %1").arg(cmnd)); + oops(i18n("Wrong command byte found in VF macro list: %1", cmnd)); fclose (VF_file); file = NULL;