diff --git a/applets/digital-clock/plugin/CMakeLists.txt b/applets/digital-clock/plugin/CMakeLists.txt
index b0afefc26..0590e6ee8 100644
--- a/applets/digital-clock/plugin/CMakeLists.txt
+++ b/applets/digital-clock/plugin/CMakeLists.txt
@@ -1,5 +1,7 @@
 project(processrunnerplugin)
 
+add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.digitalclock\")
+
 set(processrunnerplugin_SRCS
     processrunner.cpp
     processrunnerplugin.cpp
@@ -12,4 +14,4 @@ target_link_libraries(processrunnerplugin Qt5::Core
 
 install(TARGETS processrunnerplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/digitalclock)
 
-install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/digitalclock)
\ No newline at end of file
+install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/digitalclock)
diff --git a/applets/icon/CMakeLists.txt b/applets/icon/CMakeLists.txt
index 812210e96..77c77fbe3 100644
--- a/applets/icon/CMakeLists.txt
+++ b/applets/icon/CMakeLists.txt
@@ -1,5 +1,7 @@
 plasma_install_package(package org.kde.plasma.icon)
 
+add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.icon\")
+
 set(iconplugin_SRCS
   plugin/icon_p.cpp
   plugin/iconplugin.cpp
diff --git a/applets/quicklaunch/CMakeLists.txt b/applets/quicklaunch/CMakeLists.txt
index 771cab345..ca11e2d98 100644
--- a/applets/quicklaunch/CMakeLists.txt
+++ b/applets/quicklaunch/CMakeLists.txt
@@ -1,5 +1,7 @@
 project(plasma-quicklaunch)
 
+add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_quicklaunch\")
+
 set(quicklaunch_SRCS
   icongridlayout.cpp
   launcher.cpp
diff --git a/drkonqi/main.cpp b/drkonqi/main.cpp
index 318b2a74c..0714aca9d 100644
--- a/drkonqi/main.cpp
+++ b/drkonqi/main.cpp
@@ -49,6 +49,8 @@ int main(int argc, char* argv[])
     }
 #endif
 
+    KLocalizedString::setApplicationDomain("drkonqi");
+
     QApplication qa(argc, argv);
     QCoreApplication::setApplicationName(QStringLiteral("drkonqi"));
     QCoreApplication::setApplicationVersion(version);
diff --git a/freespacenotifier/CMakeLists.txt b/freespacenotifier/CMakeLists.txt
index 81ce9a504..6cf153fac 100644
--- a/freespacenotifier/CMakeLists.txt
+++ b/freespacenotifier/CMakeLists.txt
@@ -1,5 +1,7 @@
 project (freespacenotifier)
 
+add_definitions(-DTRANSLATION_DOMAIN=\"freespacenotifier\")
+
 set(kded_freespacenotifier_SRCS freespacenotifier.cpp module.cpp)
 
 ki18n_wrap_ui(kded_freespacenotifier_SRCS freespacenotifier_prefs_base.ui)
diff --git a/freespacenotifier/module.cpp b/freespacenotifier/module.cpp
index 7eb8c71e5..5dc4e9b14 100644
--- a/freespacenotifier/module.cpp
+++ b/freespacenotifier/module.cpp
@@ -21,9 +21,6 @@
 
 #include <KPluginFactory>
 
-#define TRANSLATION_DOMAIN "freespacenotifier"
-#include <KLocalizedString>
-
 K_PLUGIN_FACTORY_WITH_JSON(FreeSpaceNotifierModuleFactory,
                            "freespacenotifier.json",
                            registerPlugin<FreeSpaceNotifierModule>();
diff --git a/kglobalaccel/CMakeLists.txt b/kglobalaccel/CMakeLists.txt
index e96b77fa2..bdeedaf12 100644
--- a/kglobalaccel/CMakeLists.txt
+++ b/kglobalaccel/CMakeLists.txt
@@ -1,5 +1,7 @@
 project(kglobalaccel)
 
+add_definitions(-DTRANSLATION_DOMAIN=\"kglobalaccel\")
+
 ###############################################################################
 ### KDED Global Accel Daemon
 
diff --git a/krunner/Messages.sh b/krunner/Messages.sh
new file mode 100644
index 000000000..ce1f08153
--- /dev/null
+++ b/krunner/Messages.sh
@@ -0,0 +1,2 @@
+#! /usr/bin/env bash
+$XGETTEXT *.cpp -o $podir/krunner.pot
diff --git a/kuiserver/CMakeLists.txt b/kuiserver/CMakeLists.txt
index ddd5692f0..bb228eb42 100644
--- a/kuiserver/CMakeLists.txt
+++ b/kuiserver/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_definitions(-DTRANSLATION_DOMAIN=\"kuiserver5\")
+
 add_subdirectory( tests )
 
 set(kuiserver_KDEINIT_SRCS
diff --git a/kuiserver/main.cpp b/kuiserver/main.cpp
index 5e50beeb4..7beb17533 100644
--- a/kuiserver/main.cpp
+++ b/kuiserver/main.cpp
@@ -34,8 +34,6 @@ Q_LOGGING_CATEGORY(KUISERVER, "kuiserver")
 
 extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
 {
-    KLocalizedString::setApplicationDomain("kuiserver5");
-
     QLoggingCategory::setFilterRules(QStringLiteral("kuiserver.debug = true"));
 
     QCoreApplication app(argc, argv);
diff --git a/solidautoeject/CMakeLists.txt b/solidautoeject/CMakeLists.txt
index d25294d95..5376f238f 100644
--- a/solidautoeject/CMakeLists.txt
+++ b/solidautoeject/CMakeLists.txt
@@ -1,4 +1,5 @@
 ########### next target ###############
+add_definitions(-DTRANSLATION_DOMAIN=\"solidautoeject\")
 
 set(kded_solidautoeject_SRCS
    solidautoeject.cpp
@@ -14,4 +15,3 @@ install(TARGETS kded_solidautoeject DESTINATION ${PLUGIN_INSTALL_DIR})
 ########### install files ###############
 
 install(FILES solidautoeject.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded)
-
diff --git a/soliduiserver/CMakeLists.txt b/soliduiserver/CMakeLists.txt
index 7d58db81a..bcbe8f212 100644
--- a/soliduiserver/CMakeLists.txt
+++ b/soliduiserver/CMakeLists.txt
@@ -1,4 +1,5 @@
 ########### next target ###############
+add_definitions(-DTRANSLATION_DOMAIN=\"soliduiserver\")
 
 set(kded_soliduiserver_SRCS
    soliduiserver.cpp