From b19deae0c0abd313dcc85a51927a461be4e2818e Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 21 Jul 2021 17:04:22 +0300 Subject: [PATCH] solid: make string translation consistent in Solid::errorString() Signed-off-by: Ivailo Monev --- solid/solid/solidnamespace.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/solid/solid/solidnamespace.cpp b/solid/solid/solidnamespace.cpp index 69205456..c90a1344 100644 --- a/solid/solid/solidnamespace.cpp +++ b/solid/solid/solidnamespace.cpp @@ -19,12 +19,10 @@ */ #include "solidnamespace.h" -#include "klocale.h" static int registerSolidMetaTypes() { qRegisterMetaType(); - return 0; // something } Q_CONSTRUCTOR_FUNCTION(registerSolidMetaTypes) @@ -35,17 +33,17 @@ QString Solid::errorString(const ErrorType error) case Solid::NoError: return QString(); case Solid::UnauthorizedOperation: - return i18n("Unauthorized operation"); + return QObject::tr("Unauthorized operation"); case Solid::DeviceBusy: - return i18n("Device is busy"); + return QObject::tr("Device is busy"); case Solid::OperationFailed: - return i18n("Operation failed"); + return QObject::tr("Operation failed"); case Solid::UserCanceled: - return i18n("Canceled by user"); + return QObject::tr("Canceled by user"); case Solid::InvalidOption: - return i18n("Invalid option"); + return QObject::tr("Invalid option"); case Solid::MissingDriver: - return i18n("Missing driver"); + return QObject::tr("Missing driver"); } return QString(); }