From 4adc452d3ef7d34ba7609fd95be61a6b7cc9961b Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Sat, 13 Mar 2010 15:51:37 +0000 Subject: [PATCH] Fix HTML tags in i18n strings svn path=/trunk/kdenlive/; revision=4350 --- src/cliptranscode.cpp | 4 ++-- src/dvdwizard.cpp | 6 +++--- src/kdenlivedoc.cpp | 6 +++--- src/projectlist.cpp | 8 ++++---- src/renderwidget.cpp | 4 ++-- src/wizard.cpp | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/cliptranscode.cpp b/src/cliptranscode.cpp index 1d9e29fa..62283121 100644 --- a/src/cliptranscode.cpp +++ b/src/cliptranscode.cpp @@ -144,7 +144,7 @@ void ClipTranscode::slotTranscodeFinished(int exitCode, QProcess::ExitStatus exi button_start->setEnabled(true); if (exitCode == 0 && exitStatus == QProcess::NormalExit) { - log_text->setHtml(log_text->toPlainText() + "
" + i18n("Transcoding finished.")); + log_text->setHtml(log_text->toPlainText() + "
" + i18n("Transcoding finished.")); if (auto_add->isChecked()) { KUrl url; if (urls_list->count() > 0) { @@ -160,7 +160,7 @@ void ClipTranscode::slotTranscodeFinished(int exitCode, QProcess::ExitStatus exi return; } else if (auto_close->isChecked()) accept(); } else { - log_text->setHtml(log_text->toPlainText() + "
" + i18n("Transcoding FAILED!")); + log_text->setHtml(log_text->toPlainText() + "
" + i18n("Transcoding FAILED!")); } m_transcodeProcess.close(); diff --git a/src/dvdwizard.cpp b/src/dvdwizard.cpp index ceba71c1..377547b1 100644 --- a/src/dvdwizard.cpp +++ b/src/dvdwizard.cpp @@ -249,7 +249,7 @@ void DvdWizard::generateDvd() } else { kDebug() << "/// RENDERING MENU vob timed out"; vobitem->setIcon(KIcon("dialog-close")); - m_status.error_log->append("
" + i18n("Rendering job timed out")); + m_status.error_log->append("
" + i18n("Rendering job timed out")); m_status.error_log->scrollToAnchor("result"); m_status.error_box->setHidden(false); m_status.button_start->setEnabled(true); @@ -337,7 +337,7 @@ void DvdWizard::generateDvd() } else { kDebug() << "/// RENDERING SPUMUX MENU timed out"; spuitem->setIcon(KIcon("dialog-close")); - m_status.error_log->append("
" + i18n("Menu job timed out")); + m_status.error_log->append("
" + i18n("Menu job timed out")); m_status.error_log->scrollToAnchor("result"); m_status.error_box->setHidden(false); m_status.button_start->setEnabled(true); @@ -494,7 +494,7 @@ void DvdWizard::slotRenderFinished(int exitCode, QProcess::ExitStatus status) QListWidgetItem *authitem = m_status.job_progress->item(3); if (status == QProcess::CrashExit || exitCode != 0) { QString result(m_dvdauthor->readAllStandardError()); - result.append("
"); + result.append("
"); result.append(i18n("DVDAuthor process crashed.")); m_status.error_log->append(result); m_status.error_log->scrollToAnchor("result"); diff --git a/src/kdenlivedoc.cpp b/src/kdenlivedoc.cpp index cd1de382..dd88c3b5 100644 --- a/src/kdenlivedoc.cpp +++ b/src/kdenlivedoc.cpp @@ -878,10 +878,10 @@ void KdenliveDoc::addClip(QDomElement elem, QString clipId, bool createClipItem) int action = KMessageBox::No; if (!size.isEmpty() && !hash.isEmpty()) { if (!m_searchFolder.isEmpty()) newpath = searchFileRecursively(m_searchFolder, size, hash); - else action = (KMessageBox::ButtonCode) KMessageBox::questionYesNoCancel(kapp->activeWindow(), i18n("Clip %1
is invalid, what do you want to do?", path), i18n("File not found"), KGuiItem(i18n("Search automatically")), KGuiItem(i18n("Keep as placeholder"))); + else action = (KMessageBox::ButtonCode) KMessageBox::questionYesNoCancel(kapp->activeWindow(), i18n("Clip %1
is invalid, what do you want to do?", path), i18n("File not found"), KGuiItem(i18n("Search automatically")), KGuiItem(i18n("Keep as placeholder"))); } else { if (elem.attribute("type").toInt() == SLIDESHOW) { - int res = KMessageBox::questionYesNoCancel(kapp->activeWindow(), i18n("Clip %1
is invalid or missing, what do you want to do?", path), i18n("File not found"), KGuiItem(i18n("Search manually")), KGuiItem(i18n("Keep as placeholder"))); + int res = KMessageBox::questionYesNoCancel(kapp->activeWindow(), i18n("Clip %1
is invalid or missing, what do you want to do?", path), i18n("File not found"), KGuiItem(i18n("Search manually")), KGuiItem(i18n("Keep as placeholder"))); if (res == KMessageBox::Yes) newpath = KFileDialog::getExistingDirectory(KUrl("kfiledialog:///clipfolder"), kapp->activeWindow(), i18n("Looking for %1", path)); else { @@ -889,7 +889,7 @@ void KdenliveDoc::addClip(QDomElement elem, QString clipId, bool createClipItem) action = res; } } else { - int res = KMessageBox::questionYesNoCancel(kapp->activeWindow(), i18n("Clip %1
is invalid or missing, what do you want to do?", path), i18n("File not found"), KGuiItem(i18n("Search manually")), KGuiItem(i18n("Keep as placeholder"))); + int res = KMessageBox::questionYesNoCancel(kapp->activeWindow(), i18n("Clip %1
is invalid or missing, what do you want to do?", path), i18n("File not found"), KGuiItem(i18n("Search manually")), KGuiItem(i18n("Keep as placeholder"))); if (res == KMessageBox::Yes) newpath = KFileDialog::getOpenFileName(KUrl("kfiledialog:///clipfolder"), QString(), kapp->activeWindow(), i18n("Looking for %1", path)); else { diff --git a/src/projectlist.cpp b/src/projectlist.cpp index b3b86a57..a0618d18 100644 --- a/src/projectlist.cpp +++ b/src/projectlist.cpp @@ -613,7 +613,7 @@ void ProjectList::slotRemoveClip() folderids[folder->groupName()] = folder->clipId(); int children = folder->childCount(); - if (children > 0 && KMessageBox::questionYesNo(this, i18np("Delete folder %2?
This will also remove the clip in that folder", "Delete folder %2?
This will also remove the %1 clips in that folder", children, folder->text(1)), i18n("Delete Folder")) != KMessageBox::Yes) return; + if (children > 0 && KMessageBox::questionYesNo(this, i18np("Delete folder %2?
This will also remove the clip in that folder", "Delete folder %2?
This will also remove the %1 clips in that folder", children, folder->text(1)), i18n("Delete Folder")) != KMessageBox::Yes) return; for (int i = 0; i < children; ++i) { ProjectItem *child = static_cast (folder->child(i)); ids << child->clipId(); @@ -622,7 +622,7 @@ void ProjectList::slotRemoveClip() ProjectItem *item = static_cast (selected.at(i)); ids << item->clipId(); if (item->numReferences() > 0) { - if (KMessageBox::questionYesNo(this, i18np("Delete clip %2?
This will also remove the clip in timeline", "Delete clip %2?
This will also remove its %1 clips in timeline", item->numReferences(), item->names().at(1)), i18n("Delete Clip")) != KMessageBox::Yes) return; + if (KMessageBox::questionYesNo(this, i18np("Delete clip %2?
This will also remove the clip in timeline", "Delete clip %2?
This will also remove its %1 clips in timeline", item->numReferences(), item->names().at(1)), i18n("Delete Clip")) != KMessageBox::Yes) return; } } } @@ -957,9 +957,9 @@ void ProjectList::slotRemoveInvalidClip(const QString &id, bool replace) const QString path = item->referencedClip()->fileURL().path(); if (item->referencedClip()->isPlaceHolder()) replace = false; if (!path.isEmpty()) { - if (replace) KMessageBox::sorry(this, i18n("Clip %1
is invalid, will be removed from project.", path)); + if (replace) KMessageBox::sorry(this, i18n("Clip %1
is invalid, will be removed from project.", path)); else { - if (KMessageBox::questionYesNo(this, i18n("Clip %1
is missing or invalid. Remove it from project?", path), i18n("Invalid clip")) == KMessageBox::Yes) replace = true; + if (KMessageBox::questionYesNo(this, i18n("Clip %1
is missing or invalid. Remove it from project?", path), i18n("Invalid clip")) == KMessageBox::Yes) replace = true; } } QStringList ids; diff --git a/src/renderwidget.cpp b/src/renderwidget.cpp index 2fd3b714..51f03fb7 100644 --- a/src/renderwidget.cpp +++ b/src/renderwidget.cpp @@ -816,7 +816,7 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const if (!existing.isEmpty()) { renderItem = existing.at(0); if (renderItem->data(1, Qt::UserRole + 2).toInt() == RUNNINGJOB) { - KMessageBox::information(this, i18n("There is already a job writing file:
%1
Abort the job if you want to overwrite it...", dest), i18n("Already running")); + KMessageBox::information(this, i18n("There is already a job writing file:
%1
Abort the job if you want to overwrite it...", dest), i18n("Already running")); return; } renderItem->setData(1, Qt::UserRole + 4, QString()); @@ -1620,7 +1620,7 @@ void RenderWidget::slotStartScript() if (!existing.isEmpty()) { renderItem = existing.at(0); if (renderItem->data(1, Qt::UserRole + 2).toInt() == RUNNINGJOB) { - KMessageBox::information(this, i18n("There is already a job writing file:
%1
Abort the job if you want to overwrite it...", destination), i18n("Already running")); + KMessageBox::information(this, i18n("There is already a job writing file:
%1
Abort the job if you want to overwrite it...", destination), i18n("Already running")); return; } } else renderItem = new QTreeWidgetItem(m_view.running_jobs, QStringList() << QString() << destination << QString()); diff --git a/src/wizard.cpp b/src/wizard.cpp index 8ccde3a7..430afa2a 100644 --- a/src/wizard.cpp +++ b/src/wizard.cpp @@ -558,7 +558,7 @@ void Wizard::slotCheckMlt() if (!result.contains("sdl") || !result.contains("sdl_preview")) errorMessage.append(i18n("MLT's SDL module not found. Please check your MLT install. Kdenlive will not work until this issue is fixed.") + '\n'); if (!errorMessage.isEmpty()) { - errorMessage.prepend(QString("%1
").arg(i18n("Fatal Error"))); + errorMessage.prepend(QString("%1
").arg(i18n("Fatal Error"))); QLabel *pix = new QLabel(); pix->setPixmap(KIcon("dialog-error").pixmap(30)); QLabel *label = new QLabel(errorMessage); -- 2.39.2