diff --git a/src/main/KexiRegisterResource_p.h b/src/main/KexiRegisterResource_p.h
index d7d2f367e..6ac58497f 100644
--- a/src/main/KexiRegisterResource_p.h
+++ b/src/main/KexiRegisterResource_p.h
@@ -1,346 +1,347 @@
 /* This file is part of the KDE project
    Copyright (C) 2016 Jarosław Staniek <staniek@kde.org>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
 */
 
 #include <QCoreApplication>
 #include <QDir>
 #include <QFileInfo>
 #include <QRegularExpression>
 #include <QResource>
 #include <QStandardPaths>
 #include <QDebug>
 
 #ifdef QT_ONLY
 #define KLocalizedString QString
 #else
 #include <KConfigGroup>
 #include <KSharedConfig>
 #include <KMessageBox>
 #endif
 
 //! @todo Support other themes
 const QString supportedIconTheme = QLatin1String("breeze");
 
 //! @return true if @a path is readable
 static bool fileReadable(const QString &path)
 {
     return !path.isEmpty() && QFileInfo(path).isReadable();
 }
 
 #ifdef Q_OS_WIN
 #define KPATH_SEPARATOR ';'
 #else
 #define KPATH_SEPARATOR ':'
 #endif
 
 //! @brief Used for a workaround: locations for QStandardPaths::AppDataLocation end with app name.
 //! If this is not an expected app but for example a test app, replace
 //! the subdir name with app name so we can find resource file(s).
 static QStringList correctStandardLocations(const QString &privateName,
                                      QStandardPaths::StandardLocation location,
                                      const QString &extraLocation)
 {
     QStringList result;
     if (!privateName.isEmpty()) {
         QRegularExpression re(QLatin1Char('/') + QCoreApplication::applicationName() + QLatin1Char('$'));
         QStringList standardLocations(QStandardPaths::standardLocations(location));
         if (!extraLocation.isEmpty()) {
             standardLocations.append(extraLocation);
         }
         for(const QString &dir : standardLocations) {
             if (dir.indexOf(re) != -1) {
                 QString realDir(dir);
                 realDir.replace(re, QLatin1Char('/') + privateName);
                 result.append(realDir);
             }
         }
     }
     return result;
 }
 
 static QString locateFile(const QString &privateName,
                           const QString& path, QStandardPaths::StandardLocation location,
                           const QString &extraLocation)
 {
     // let QStandardPaths handle this, it will look for app local stuff
     QString fullPath = QFileInfo(
         QStandardPaths::locate(location, path)).canonicalFilePath();
     if (fileReadable(fullPath)) {
         return fullPath;
     }
 
     // Try extra locations
     if (!extraLocation.isEmpty()) {
         fullPath = QFileInfo(extraLocation + '/' + path).canonicalFilePath();
         if (fileReadable(fullPath)) {
             return fullPath;
         }
     }
     // This makes the app portable and working without installation, from the build dir
     const QString dataDir = QFileInfo(QCoreApplication::applicationDirPath() + QStringLiteral("/data/") + path).canonicalFilePath();
     if (fileReadable(dataDir)) {
         return dataDir;
     }
     // Try in PATH subdirs, useful for running apps from the build dir, without installing
     for(const QByteArray &pathDir : qgetenv("PATH").split(KPATH_SEPARATOR)) {
         const QString dataDirFromPath = QFileInfo(QFile::decodeName(pathDir) + QStringLiteral("/data/")
                                                   + path).canonicalFilePath();
         if (fileReadable(dataDirFromPath)) {
             return dataDirFromPath;
         }
     }
 
     const QStringList correctedStandardLocations(correctStandardLocations(privateName, location, extraLocation));
     for(const QString &dir : correctedStandardLocations) {
         fullPath = QFileInfo(dir + QLatin1Char('/') + path).canonicalFilePath();
         if (fileReadable(fullPath)) {
             return fullPath;
         }
     }
     return fullPath;
 }
 
 #ifndef KEXI_SKIP_REGISTERRESOURCE
 
 #ifdef KEXI_BASE_PATH
 #define BASE_PATH KEXI_BASE_PATH
 #else
 #define BASE_PATH QCoreApplication::applicationName()
 #endif
 
 static bool registerResource(const QString& path, QStandardPaths::StandardLocation location,
                              const QString &resourceRoot, const QString &extraLocation,
                              KLocalizedString *errorMessage, KLocalizedString *detailsErrorMessage)
 {
     const QString fullPath = locateFile(BASE_PATH,
                                         path, location, extraLocation);
     if (fullPath.isEmpty()
         || !QResource::registerResource(fullPath, resourceRoot))
     {
         QStringList triedLocations(QStandardPaths::standardLocations(location));
         if (!extraLocation.isEmpty()) {
             triedLocations.append(extraLocation);
         }
         const QString triedLocationsString = QLocale().createSeparatedList(triedLocations);
 #ifdef QT_ONLY
         *errorMessage = QString("Could not open icon resource file %1.").arg(path);
         *detailsErrorMessage = QString("Tried to find in %1.").arg(triedLocationsString);
 #else
         *errorMessage = kxi18nc("@info",
             "<para>Could not open icon resource file <filename>%1</filename>.</para>"
             "<para><application>Kexi</application> will not start. "
             "Please check if <application>Kexi</application> is properly installed.</para>")
             .subs(QFileInfo(path).fileName());
         *detailsErrorMessage = kxi18nc("@info Tried to find files in <dir list>",
                                        "Tried to find in %1.").subs(triedLocationsString);
 #endif
         return false;
     }
     *errorMessage = KLocalizedString();
     *detailsErrorMessage = KLocalizedString();
     return true;
 }
 #endif // !KEXI_SKIP_REGISTERRESOURCE
 
 #ifndef KEXI_SKIP_SETUPBREEZEICONTHEME
 
 inline bool registerGlobalBreezeIconsResource(KLocalizedString *errorMessage,
                                               KLocalizedString *detailsErrorMessage)
 {
     QString extraLocation;
 #ifdef CMAKE_INSTALL_FULL_ICONDIR
     extraLocation = QDir::fromNativeSeparators(QFile::decodeName(CMAKE_INSTALL_FULL_ICONDIR));
     if (extraLocation.endsWith("/icons")) {
         extraLocation.chop(QLatin1String("/icons").size());
     }
 #endif
     return registerResource("icons/breeze/breeze-icons.rcc", QStandardPaths::GenericDataLocation,
                             QStringLiteral("/icons/breeze"), extraLocation, errorMessage,
                             detailsErrorMessage);
 }
 
 //! Tell Qt about the theme
 inline void setupBreezeIconTheme()
 {
 #ifdef QT_GUI_LIB
     QIcon::setThemeSearchPaths(QStringList() << QStringLiteral(":/icons"));
     QIcon::setThemeName(QStringLiteral("breeze"));
 #endif
 }
 #endif // !KEXI_SETUPBREEZEICONTHEME
 
 #ifndef KEXI_SKIP_REGISTERICONSRESOURCE
 /*! @brief Registers icons resource file
  * @param privateName Name to be used instead of application name for resource lookup
  * @param path Relative path to the resource file
  * @param location Standard file location to use for file lookup
  * @param resourceRoot A resource root for QResource::registerResource()
  * @param errorMessage On failure it is set to a brief error message.
  * @param errorDescription On failure it is set to a detailed error message.
  * other for warning
  */
 static bool registerIconsResource(const QString &privateName, const QString& path,
                              QStandardPaths::StandardLocation location,
                              const QString &resourceRoot, const QString &extraLocation,
                              QString *errorMessage, QString *detailedErrorMessage)
 {
     const QString fullPath = locateFile(privateName, path, location, extraLocation);
     if (fullPath.isEmpty() || !QFileInfo(fullPath).isReadable()
         || !QResource::registerResource(fullPath, resourceRoot))
     {
         QStringList triedLocations(QStandardPaths::standardLocations(location));
         if (!extraLocation.isEmpty()) {
             triedLocations.append(extraLocation);
         }
         triedLocations.append(correctStandardLocations(privateName, location, extraLocation));
         const QString triedLocationsString = QLocale().createSeparatedList(triedLocations);
 #ifdef QT_ONLY
-        *errorMessage = QString("Could not open icon resource file %1.").arg(path);
+        *errorMessage
+            = QString("Could not open icon resource file \"%1\". Please check if application "
+                      "is properly installed.").arg(path);
         *detailedErrorMessage = QString("Tried to find in %1.").arg(triedLocationsString);
 #else
-        //! @todo 3.1 Re-add translation
-        *errorMessage = /*QObject::tr*/ QString::fromLatin1(
-            "Could not open icon resource file \"%1\". "
-            "Please check if application is properly installed.")
-            .arg(QFileInfo(path).fileName());
-        //! @todo 3.1 Re-add translation
-        *detailedErrorMessage = QString::fromLatin1("Tried to find in %1.").arg(triedLocationsString);
+        *errorMessage = xi18nc(
+            "@info", "Could not open icon resource file <filename>%1</filename>. "
+                     "Please check if <application>%2</application> is properly installed.",
+            QFileInfo(path).fileName(), QApplication::applicationDisplayName());
+        *detailedErrorMessage = xi18nc("@info Tried to find files in <dir list>",
+                                       "Tried to find in %1.", triedLocationsString);
 #endif
         return false;
     }
     *errorMessage = QString();
     *detailedErrorMessage = QString();
     return true;
 }
 #endif // !KEXI_SKIP_SETUPBREEZEICONTHEME
 
 #if !defined QT_ONLY  && !defined KEXI_SKIP_SETUPPRIVATEICONSRESOURCE
 /*! @brief Sets up a private icon resource file
  * @return @c false on failure and sets error message. Does not warn or exit on failure.
  * @param privateName Name to be used instead of application name for resource lookup
  * @param path Relative path to the resource file
  * @param themeName Icon theme to use. It affects filename.
  * @param errorMessage On failure it is set to a brief error message
  * @param errorDescription On failure it is set to a detailed error message
  * other for warning
  * @param prefix Resource path prefix. The default is useful for library-global resource,
  * other values is useful for plugins.
  */
 static bool setupPrivateIconsResource(const QString &privateName, const QString& path,
                                const QString &themeName,
                                QString *errorMessage, QString *detailedErrorMessage,
                                const QString &prefix = QLatin1String(":/icons"))
 {
     // Register application's resource first to have priority over the theme.
     // Some icons may exists in both resources.
     if (!registerIconsResource(privateName, path,
                           QStandardPaths::AppDataLocation,
                           QString(), QString(), errorMessage, detailedErrorMessage))
     {
         return false;
     }
     bool changeTheme = false;
 #ifdef QT_GUI_LIB
     QIcon::setThemeSearchPaths(QStringList() << prefix << QIcon::themeSearchPaths());
     changeTheme = 0 != QIcon::themeName().compare(themeName, Qt::CaseInsensitive);
     if (changeTheme) {
         QIcon::setThemeName(themeName);
     }
 #endif
 
     KConfigGroup cg(KSharedConfig::openConfig(), "Icons");
     changeTheme = changeTheme || 0 != cg.readEntry("Theme", QString()).compare(themeName, Qt::CaseInsensitive);
     // tell KIconLoader an co. about the theme
     if (changeTheme) {
         cg.writeEntry("Theme", themeName);
         cg.sync();
     }
     return true;
 }
 
 /*! @brief Sets up a private icon resource file
  * @return @c false on failure and sets error message.
  * @param privateName Name to be used instead of application name for resource lookup
  * @param path Relative path to the resource file
  * @param themeName Icon theme to use. It affects filename.
  * @param errorMessage On failure it is set to a brief error message.
  * @param errorDescription On failure it is set to a detailed error message.
  * other for warning
  * @param prefix Resource path prefix. The default is useful for library-global resource,
  * other values is useful for plugins.
  */
 static bool setupPrivateIconsResourceWithMessage(const QString &privateName, const QString& path,
                                           const QString &themeName,
                                           QString *errorMessage, QString *detailedErrorMessage,
                                           const QString &prefix = QLatin1String(":/icons"))
 {
     if (!setupPrivateIconsResource(privateName, path, themeName,
                                    errorMessage, detailedErrorMessage, prefix))
     {
         if (detailedErrorMessage->isEmpty()) {
             KMessageBox::error(nullptr, *errorMessage);
         } else {
             KMessageBox::detailedError(nullptr, *errorMessage, *detailedErrorMessage);
         }
         return false;
     }
     return true;
 }
 
 /*! @overload setupPrivateIconsResourceWithMessage(QString &privateName, const QString& path,
                                           const QString &themeName,
                                           QString *errorMessage, QString *detailedErrorMessage,
                                           const QString &prefix = QLatin1String(":/icons"))
     Uses default theme name.
  */
 static bool setupPrivateIconsResourceWithMessage(const QString &privateName, const QString& path,
                                           QString *errorMessage, QString *detailedErrorMessage,
                                           const QString &prefix = QLatin1String(":/icons"))
 {
     return setupPrivateIconsResourceWithMessage(privateName, path, supportedIconTheme,
                                                 errorMessage, detailedErrorMessage, prefix);
 }
 
 /*! @brief Sets up a private icon resource file
  * Warns on failure and returns @c false.
  * @param privateName Name to be used instead of application name for resource lookup
  * @param path Relative path to the resource file
  * @param messageType Type of message to use on error, QtFatalMsg for fatal exit and any
  * other for warning
  * @param prefix Resource path prefix. The default is useful for library-global resource,
  * other values is useful for plugins.
  */
 static bool setupPrivateIconsResourceWithMessage(const QString &privateName, const QString& path,
                                           QtMsgType messageType,
                                           const QString &prefix = QLatin1String(":/icons"))
 {
     QString errorMessage;
     QString detailedErrorMessage;
     if (!setupPrivateIconsResourceWithMessage(privateName, path,
                                               &errorMessage, &detailedErrorMessage, prefix)) {
         if (messageType == QtFatalMsg) {
             qFatal("%s %s", qPrintable(errorMessage), qPrintable(detailedErrorMessage));
         } else {
             qWarning() << qPrintable(errorMessage) << qPrintable(detailedErrorMessage);
         }
         return false;
     }
     return true;
 }
 
 #endif // !QT_ONLY && !KEXI_SKIP_SETUPPRIVATEICONSRESOURCE