diff --git a/ark/kerfuffle/extractiondialog.cpp b/ark/kerfuffle/extractiondialog.cpp index bcfd547b..a015ed4c 100644 --- a/ark/kerfuffle/extractiondialog.cpp +++ b/ark/kerfuffle/extractiondialog.cpp @@ -110,7 +110,7 @@ void ExtractionDialog::accept() while (1) { if (KIO::NetAccess::exists(pathWithSubfolder, KIO::NetAccess::SourceSide, 0)) { if (QFileInfo(pathWithSubfolder).isDir()) { - int overwrite = KMessageBox::questionYesNoCancel(0, i18nc("@info", "The folder %1 already exists. Are you sure you want to extract here?", pathWithSubfolder), i18n("Folder exists"), KGuiItem(i18n("Extract here")), KGuiItem(i18n("Retry")), KGuiItem(i18n("Cancel"))); + int overwrite = KMessageBox::questionYesNoCancel(0, i18nc("@info", "The folder %1 already exists. Are you sure you want to extract here?", pathWithSubfolder), i18n("Folder exists"), KGuiItem(i18n("Extract here")), KGuiItem(i18n("Retry")), KGuiItem(i18n("Cancel"))); if (overwrite == KMessageBox::No) { // The user clicked Retry. @@ -120,13 +120,13 @@ void ExtractionDialog::accept() } } else { KMessageBox::detailedError(0, - i18nc("@info", "The folder %1 could not be created.", subfolder()), - i18nc("@info", "%1 already exists, but is not a folder.", subfolder())); + i18nc("@info", "The folder %1 could not be created.", subfolder()), + i18nc("@info", "%1 already exists, but is not a folder.", subfolder())); return; } } else if (!KIO::NetAccess::mkdir(pathWithSubfolder, 0)) { KMessageBox::detailedError(0, - i18nc("@info", "The folder %1 could not be created.", subfolder()), + i18nc("@info", "The folder %1 could not be created.", subfolder()), i18n("Please check your permissions to create it.")); return; } diff --git a/ark/kerfuffle/queries.cpp b/ark/kerfuffle/queries.cpp index 16c4f651..5ce15ccc 100644 --- a/ark/kerfuffle/queries.cpp +++ b/ark/kerfuffle/queries.cpp @@ -175,7 +175,7 @@ void PasswordNeededQuery::execute() QApplication::setOverrideCursor(QCursor(Qt::ArrowCursor)); QWeakPointer dlg = new KPasswordDialog; - dlg.data()->setPrompt(i18nc("@info", "The archive %1 is password protected. Please enter the password to extract the file.", m_data.value(QLatin1String( "archiveFilename" )).toString())); + dlg.data()->setPrompt(i18nc("@info", "The archive %1 is password protected. Please enter the password to extract the file.", m_data.value(QLatin1String( "archiveFilename" )).toString())); if (m_data.value(QLatin1String("incorrectTryAgain")).toBool()) { dlg.data()->showErrorMessage(i18n("Incorrect password, please try again."), KPasswordDialog::PasswordError); diff --git a/ark/part/part.cpp b/ark/part/part.cpp index 24fd0424..02805261 100644 --- a/ark/part/part.cpp +++ b/ark/part/part.cpp @@ -396,14 +396,14 @@ bool Part::openFile() if (localFileInfo.isDir()) { KMessageBox::error(NULL, i18nc("@info", - "%1 is a directory.", + "%1 is a directory.", localFile)); return false; } if (creatingNewArchive) { if (localFileInfo.exists()) { - int overwrite = KMessageBox::questionYesNo(NULL, i18nc("@info", "The archive %1 already exists. Would you like to open it instead?", localFile), i18nc("@title:window", "File Exists"), KGuiItem(i18n("Open File")), KStandardGuiItem::cancel()); + int overwrite = KMessageBox::questionYesNo(NULL, i18nc("@info", "The archive %1 already exists. Would you like to open it instead?", localFile), i18nc("@title:window", "File Exists"), KGuiItem(i18n("Open File")), KStandardGuiItem::cancel()); if (overwrite == KMessageBox::No) { return false; @@ -411,7 +411,7 @@ bool Part::openFile() } } else { if (!localFileInfo.exists()) { - KMessageBox::sorry(NULL, i18nc("@info", "The archive %1 was not found.", localFile), i18nc("@title:window", "Error Opening Archive")); + KMessageBox::sorry(NULL, i18nc("@info", "The archive %1 was not found.", localFile), i18nc("@title:window", "Error Opening Archive")); return false; } } @@ -464,7 +464,7 @@ bool Part::openFile() } if (!archive) { - KMessageBox::sorry(NULL, i18nc("@info", "Ark was not able to open the archive %1. No plugin capable of handling the file was found.", localFile), i18nc("@title:window", "Error Opening Archive")); + KMessageBox::sorry(NULL, i18nc("@info", "Ark was not able to open the archive %1. No plugin capable of handling the file was found.", localFile), i18nc("@title:window", "Error Opening Archive")); return false; } @@ -500,7 +500,7 @@ void Part::slotLoadingFinished(KJob *job) if (job->error()) { if (arguments().metaData()[QLatin1String( "createNewArchive" )] != QLatin1String( "true" )) { - KMessageBox::sorry(NULL, i18nc("@info", "Loading the archive %1 failed with the following error: %2", localFilePath(), job->errorText()), i18nc("@title:window", "Error Opening Archive")); + KMessageBox::sorry(NULL, i18nc("@info", "Loading the archive %1 failed with the following error: %2", localFilePath(), job->errorText()), i18nc("@title:window", "Error Opening Archive")); // The file failed to open, so reset the open archive, info panel and caption. m_model->setArchive(NULL); @@ -915,7 +915,7 @@ void Part::slotSaveAs() if ((saveUrl.isValid()) && (!saveUrl.isEmpty())) { if (KIO::NetAccess::exists(saveUrl, KIO::NetAccess::DestinationSide, widget())) { int overwrite = KMessageBox::warningContinueCancel(widget(), - i18nc("@info", "An archive named %1 already exists. Are you sure you want to overwrite it?", saveUrl.fileName()), + i18nc("@info", "An archive named %1 already exists. Are you sure you want to overwrite it?", saveUrl.fileName()), QString(), KStandardGuiItem::overwrite()); @@ -929,7 +929,7 @@ void Part::slotSaveAs() if (!QFile::exists(localFilePath())) { if (url().isLocalFile()) { KMessageBox::error(widget(), - i18nc("@info", "The archive %1 cannot be copied to the specified location. The archive does not exist anymore.", localFilePath())); + i18nc("@info", "The archive %1 cannot be copied to the specified location. The archive does not exist anymore.", localFilePath())); return; } else { @@ -941,7 +941,7 @@ void Part::slotSaveAs() if (!KIO::NetAccess::synchronousRun(copyJob, widget())) { KMessageBox::error(widget(), - i18nc("@info", "The archive could not be saved as %1. Try saving it to another location.", saveUrl.pathOrUrl())); + i18nc("@info", "The archive could not be saved as %1. Try saving it to another location.", saveUrl.pathOrUrl())); } } } diff --git a/ark/plugins/libarchive/libarchivehandler.cpp b/ark/plugins/libarchive/libarchivehandler.cpp index 80c7a0ed..85387d1c 100644 --- a/ark/plugins/libarchive/libarchivehandler.cpp +++ b/ark/plugins/libarchive/libarchivehandler.cpp @@ -64,7 +64,7 @@ bool LibArchiveInterface::list() { KArchive karchive(filename()); if (!karchive.isReadable()) { - emit error(i18nc("@info", "Could not open the archive %1: %2.", filename(), karchive.errorString())); + emit error(i18nc("@info", "Could not open the archive %1: %2.", filename(), karchive.errorString())); return false; } @@ -86,7 +86,7 @@ bool LibArchiveInterface::copyFiles(const QVariantList& files, const QString &de KArchive karchive(filename()); if (!karchive.isReadable()) { - emit error(i18nc("@info", "Could not open the archive %1: %2.", filename(), karchive.errorString())); + emit error(i18nc("@info", "Could not open the archive %1: %2.", filename(), karchive.errorString())); return false; } @@ -173,7 +173,7 @@ bool LibArchiveInterface::addFiles(const QStringList &files, const CompressionOp KArchive karchive(filename()); if (!karchive.isWritable()) { - emit error(i18nc("@info", "Could not open the archive %1: %2.", filename(), karchive.errorString())); + emit error(i18nc("@info", "Could not open the archive %1: %2.", filename(), karchive.errorString())); return false; } @@ -211,7 +211,7 @@ bool LibArchiveInterface::deleteFiles(const QVariantList &files) { KArchive karchive(filename()); if (!karchive.isWritable()) { - emit error(i18nc("@info", "Could not open the archive %1: %2.", filename(), karchive.errorString())); + emit error(i18nc("@info", "Could not open the archive %1: %2.", filename(), karchive.errorString())); return false; } diff --git a/ark/plugins/libsinglefileplugin/singlefileplugin.cpp b/ark/plugins/libsinglefileplugin/singlefileplugin.cpp index ee9441bb..0bd40fa3 100644 --- a/ark/plugins/libsinglefileplugin/singlefileplugin.cpp +++ b/ark/plugins/libsinglefileplugin/singlefileplugin.cpp @@ -69,7 +69,7 @@ bool LibSingleFileInterface::copyFiles(const QList &files, const QStri if (!kdecompressor.setType(KDecompressor::typeForMime(m_mimeType)) && !kdecompressor.setType(KDecompressor::typeForFile(inputfile))) { kDebug() << "Could not set KDecompressor type"; - emit error(i18nc("@info", "Ark could not open %1 for extraction.", inputfile)); + emit error(i18nc("@info", "Ark could not open %1 for extraction.", inputfile)); return false; } @@ -77,20 +77,20 @@ bool LibSingleFileInterface::copyFiles(const QList &files, const QStri QFile inputdevice(inputfile); if (!inputdevice.open(QFile::ReadOnly)) { kDebug() << "Could not open input file"; - emit error(i18n("Ark could not open %1 for reading.", inputfile)); + emit error(i18n("Ark could not open %1 for reading.", inputfile)); return false; } if (!kdecompressor.process(inputdevice.readAll())) { kDebug() << "Could not process input"; - emit error(i18n("Ark could not process %1.", inputfile)); + emit error(i18n("Ark could not process %1.", inputfile)); return false; } QFile outputdevice(outputFileName); if (!outputdevice.open(QIODevice::WriteOnly)) { kDebug() << "Failed to open output file" << outputdevice.errorString(); - emit error(i18nc("@info", "Ark could not open %1 for writing.", outputFileName)); + emit error(i18nc("@info", "Ark could not open %1 for writing.", outputFileName)); return false; } @@ -98,7 +98,7 @@ bool LibSingleFileInterface::copyFiles(const QList &files, const QStri const QByteArray decompressed = kdecompressor.result(); if (outputdevice.write(decompressed.constData(), decompressed.size()) != decompressed.size()) { kDebug() << "Could not write output file"; - emit error(i18n("Ark could not write %1.", outputFileName)); + emit error(i18n("Ark could not write %1.", outputFileName)); QFile::remove(outputFileName); // in case of partial write return false; } @@ -186,27 +186,27 @@ bool LibSingleFileInterface::addFiles(const QStringList & files, const Kerfuffle QFile inputdevice(inputfile); if (!inputdevice.open(QFile::ReadOnly)) { kDebug() << "Could not open input file"; - emit error(i18n("Ark could not open %1 for reading.", inputfile)); + emit error(i18n("Ark could not open %1 for reading.", inputfile)); return false; } if (!kcompressor.process(inputdevice.readAll())) { kDebug() << "Could not process input"; - emit error(i18n("Ark could not process %1.", inputfile)); + emit error(i18n("Ark could not process %1.", inputfile)); return false; } QFile outputdevice(outputfile); if (!outputdevice.open(QFile::WriteOnly)) { kDebug() << "Could not open output file"; - emit error(i18n("Ark could not open %1 for writing.", outputfile)); + emit error(i18n("Ark could not open %1 for writing.", outputfile)); return false; } const QByteArray compressed = kcompressor.result(); if (outputdevice.write(compressed.constData(), compressed.size()) != compressed.size()) { kDebug() << "Could not write output file"; - emit error(i18n("Ark could not write %1.", outputfile)); + emit error(i18n("Ark could not write %1.", outputfile)); QFile::remove(outputfile); // in case of partial write return false; } diff --git a/gwenview/app/fileoperations.cpp b/gwenview/app/fileoperations.cpp index dbb5b3d4..a4b01a21 100644 --- a/gwenview/app/fileoperations.cpp +++ b/gwenview/app/fileoperations.cpp @@ -190,7 +190,7 @@ void rename(const KUrl& oldUrl, QWidget* parent) { QString name = KInputDialog::getText( i18nc("@title:window", "Rename") /* caption */, - i18n("Rename %1 to:", oldUrl.fileName()) /* label */, + i18n("Rename %1 to:", oldUrl.fileName()) /* label */, oldUrl.fileName() /* value */, 0 /* ok */, parent diff --git a/gwenview/app/gvcore.cpp b/gwenview/app/gvcore.cpp index d02cd03f..f18eb9a6 100644 --- a/gwenview/app/gvcore.cpp +++ b/gwenview/app/gvcore.cpp @@ -238,7 +238,7 @@ void GvCore::saveAs(const KUrl& url) int answer = KMessageBox::warningContinueCancel( d->mMainWindow, i18nc("@info", - "A file named %1 already exists.\n" + "A file named %1 already exists.\n" "Are you sure you want to overwrite it?", saveAsUrl.fileName()), QString(), @@ -253,7 +253,7 @@ void GvCore::saveAs(const KUrl& url) KJob* job = doc->save(saveAsUrl, format.data()); if (!job) { const QString name = saveAsUrl.fileName().isEmpty() ? saveAsUrl.pathOrUrl() : saveAsUrl.fileName(); - const QString msg = i18nc("@info", "Saving %1 failed:
%2", + const QString msg = i18nc("@info", "Saving %1 failed:
%2", name, doc->errorString()); KMessageBox::sorry(QApplication::activeWindow(), msg); } else { @@ -276,7 +276,7 @@ void GvCore::slotSaveResult(KJob* _job) if (job->error()) { QString name = newUrl.fileName().isEmpty() ? newUrl.pathOrUrl() : newUrl.fileName(); - QString msg = i18nc("@info", "Saving %1 failed:
%2", + QString msg = i18nc("@info", "Saving %1 failed:
%2", name, job->errorString()); int result = KMessageBox::warningContinueCancel( diff --git a/gwenview/app/saveallhelper.cpp b/gwenview/app/saveallhelper.cpp index 835e4700..053c272c 100644 --- a/gwenview/app/saveallhelper.cpp +++ b/gwenview/app/saveallhelper.cpp @@ -103,7 +103,7 @@ void SaveAllHelper::slotResult(KJob* _job) KUrl url = job->document()->url(); QString name = url.fileName().isEmpty() ? url.pathOrUrl() : url.fileName(); d->mErrorList << i18nc("@info %1 is the name of the document which failed to save, %2 is the reason for the failure", - "%1: %2", name, job->errorString()); + "%1: %2", name, job->errorString()); } d->mJobSet.remove(job); QProgressBar* bar = d->mProgressDialog->progressBar(); diff --git a/gwenview/lib/documentview/documentview.cpp b/gwenview/lib/documentview/documentview.cpp index 8bd20e59..139d7146 100644 --- a/gwenview/lib/documentview/documentview.cpp +++ b/gwenview/lib/documentview/documentview.cpp @@ -445,7 +445,7 @@ void DocumentView::slotLoadingFailed() d->hideLoadingIndicator(); MessageViewAdapter* adapter = new MessageViewAdapter(); adapter->setDocument(d->mDocument); - QString message = i18n("Loading %1 failed", d->mDocument->url().fileName()); + QString message = i18n("Loading %1 failed", d->mDocument->url().fileName()); adapter->setErrorMessage(message, d->mDocument->errorString()); d->setCurrentAdapter(adapter); d->updateCaption();