From 2dd871389ec69959aced7647e2b57f29463547b7 Mon Sep 17 00:00:00 2001 From: wmayer Date: Fri, 8 May 2015 01:08:19 +0200 Subject: [PATCH] + fix branding bug, use tr() function of class not QObject --- src/Gui/Assistant.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Gui/Assistant.cpp b/src/Gui/Assistant.cpp index b650bf4e3..5d5d5083b 100644 --- a/src/Gui/Assistant.cpp +++ b/src/Gui/Assistant.cpp @@ -38,6 +38,8 @@ using namespace Gui; +/* TRANSLATOR Gui::Assistant */ + Assistant::Assistant() : proc(0) { @@ -100,8 +102,8 @@ bool Assistant::startAssistant() Base::FileInfo fi ( (const char*)qhc.toUtf8() ); if (!fi.isReadable()) { - QMessageBox::critical(0, QObject::tr("%1 Help").arg(exe), - QObject::tr("FreeCAD help files not found (%1). You might need to install the FreeCAD documentation package.").arg(qhc)); + QMessageBox::critical(0, tr("%1 Help").arg(exe), + tr("%1 help files not found (%2). You might need to install the %1 documentation package.").arg(exe).arg(qhc)); return false; } @@ -110,7 +112,7 @@ bool Assistant::startAssistant() Base::Console().Log("Help file at %s\n", (const char*)qhc.toUtf8()); first = false; } - + QStringList args; args << QLatin1String("-collectionFile") << qhc @@ -119,8 +121,8 @@ bool Assistant::startAssistant() proc->start(app, args); if (!proc->waitForStarted()) { - QMessageBox::critical(0, QObject::tr("%1 Help").arg(exe), - QObject::tr("Unable to launch Qt Assistant (%1)").arg(app)); + QMessageBox::critical(0, tr("%1 Help").arg(exe), + tr("Unable to launch Qt Assistant (%1)").arg(app)); return false; } }