diff --git a/nymea-app/main.cpp b/nymea-app/main.cpp
index b6561961..ff664b5d 100644
--- a/nymea-app/main.cpp
+++ b/nymea-app/main.cpp
@@ -78,10 +78,14 @@ int main(int argc, char *argv[])
             QLibraryInfo::location(QLibraryInfo::TranslationsPath));
     application.installTranslator(&qtTranslator);
 
-    QTranslator meaTranslator;
-    qDebug() << "Loading translation file:" << ":/translations/nymea-app-" + QLocale::system().name();
-    meaTranslator.load(":/translations/nymea-app-" + QLocale::system().name());
-    application.installTranslator(&meaTranslator);
+    QTranslator appTranslator;
+    bool translationResult = appTranslator.load(QLocale(), "nymea-app", "-", ":/translations/", ".qm");
+    if (translationResult) {
+        qDebug() << "Loaded translation for locale" << QLocale();
+    } else {
+        qWarning() << "Failed to load translations for locale" << QLocale();
+    }
+    application.installTranslator(&appTranslator);
 
     qDebug() << "Running on" << QSysInfo::machineHostName() << QSysInfo::prettyProductName() << QSysInfo::productType() << QSysInfo::productVersion();
 
diff --git a/nymea-app/nymea-app.pro b/nymea-app/nymea-app.pro
index 241270c3..a2b96c44 100644
--- a/nymea-app/nymea-app.pro
+++ b/nymea-app/nymea-app.pro
@@ -30,7 +30,8 @@ SOURCES += main.cpp \
 
 RESOURCES += resources.qrc \
     ruletemplates.qrc \
-    images.qrc
+    images.qrc \
+    translations.qrc
 equals(STYLES_PATH, "") {
     RESOURCES += styles.qrc
 } else {
diff --git a/nymea-app/resources.qrc b/nymea-app/resources.qrc
index e3ef4ff8..37cf8466 100644
--- a/nymea-app/resources.qrc
+++ b/nymea-app/resources.qrc
@@ -129,8 +129,6 @@
         <file>ui/fonts/Ubuntu-R.ttf</file>
         <file>ui/fonts/Ubuntu-RI.ttf</file>
         <file>qtquickcontrols2.conf</file>
-        <file>translations/nymea-app-de_DE.qm</file>
-        <file>translations/nymea-app-en_US.qm</file>
         <file>../LICENSE</file>
         <file>ui/customviews/GenericTypeGraphPre110.qml</file>
         <file>ui/customviews/GenericTypeGraph.qml</file>
diff --git a/nymea-app/translations.qrc b/nymea-app/translations.qrc
new file mode 100644
index 00000000..f3fd9434
--- /dev/null
+++ b/nymea-app/translations.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file>translations</file>
+    </qresource>
+</RCC>
diff --git a/nymea-app/translations/nymea-app-de_DE.ts b/nymea-app/translations/nymea-app-de.ts
similarity index 100%
rename from nymea-app/translations/nymea-app-de_DE.ts
rename to nymea-app/translations/nymea-app-de.ts