diff --git a/step/data/CMakeLists.txt b/step/data/CMakeLists.txt
--- a/step/data/CMakeLists.txt
+++ b/step/data/CMakeLists.txt
@@ -1,7 +1,3 @@
-if(CURRENT_LANG)
-    set(STEP_BUILD_TRANSLATIONS 1)
-endif(CURRENT_LANG)
-
 if(STEP_BUILD_TRANSLATIONS)
 
     find_package(PythonInterp)
diff --git a/step/data/Messages.sh b/step/data/Messages.sh
--- a/step/data/Messages.sh
+++ b/step/data/Messages.sh
@@ -10,9 +10,8 @@
         --parse-unquoted='--context=HTML:%(tag)s --tag-regex=^(?:title|body|p|h[1-6])$ --recursive --strip' \
         ./examples/*.step ./tutorials/*.step --output=examples.cpp
 
-# Temporary commented-out
-#$XGETTEXT objinfo.cpp -o $podir/step_objinfo_files.pot
-#$XGETTEXT examples.cpp -o $podir/step_example_files.pot
+$XGETTEXT objinfo.cpp -o $podir/step_objinfo_files.pot
+$XGETTEXT examples.cpp -o $podir/step_example_files.pot
 
 rm -f objinfo.cpp
 rm -f examples.cpp
diff --git a/step/data/examples/CMakeLists.txt b/step/data/examples/CMakeLists.txt
--- a/step/data/examples/CMakeLists.txt
+++ b/step/data/examples/CMakeLists.txt
@@ -1,18 +1,16 @@
 FILE(GLOB STEP_EXAMPLE_FILES "*.step")
 
+install(FILES
+       ${STEP_EXAMPLE_FILES}
+       DESTINATION  ${KDE_INSTALL_DATADIR}/step/examples)
+
 if(STEP_BUILD_TRANSLATIONS)
 
-    set(po_file ${CMAKE_SOURCE_DIR}/messages/kdeedu/step_example_files.po)
+    set(po_file ${CMAKE_SOURCE_DIR}/po/*/step_example_files.po)
     STEP_PROCESS_XML_TRANSLATION(${CURRENT_LANG} ${po_file}
             "--context='%(tag)s' --tag=name --tag=text --unquote --parse-unquoted='--context=HTML:%(tag)s --tag-regex=^(?:title|body|p|h[1-6])$$ --recursive --strip'"
             ALL INSTALL_DESTINATION ${KDE_INSTALL_DATADIR}/step/examples
             ${STEP_EXAMPLE_FILES})
 
-else(STEP_BUILD_TRANSLATIONS)
-
-    install(FILES 
-       ${STEP_EXAMPLE_FILES}
-       DESTINATION  ${KDE_INSTALL_DATADIR}/step/examples)
-
 endif(STEP_BUILD_TRANSLATIONS)
 
diff --git a/step/data/objectinfo/CMakeLists.txt b/step/data/objectinfo/CMakeLists.txt
--- a/step/data/objectinfo/CMakeLists.txt
+++ b/step/data/objectinfo/CMakeLists.txt
@@ -1,10 +1,16 @@
 FILE(GLOB INFO_HTML_FILES "*.html")
+install(FILES
+   ${INFO_HTML_FILES}
+   DESTINATION  ${KDE_INSTALL_DATADIR}/step/objinfo)
 
 if(STEP_BUILD_TRANSLATIONS)
-
-    set(po_file ${CMAKE_SOURCE_DIR}/messages/kdeedu/step_objinfo_files.po)
-    STEP_PROCESS_XML_TRANSLATION(${CURRENT_LANG} ${po_file}
+    FILE(GLOB po_files "${CMAKE_SOURCE_DIR}/po/*/step_objinfo_files.po")
+    foreach(po_file ${po_files})
+        get_filename_component(po_dir ${po_file} DIRECTORY)
+        get_filename_component(CURRENT_LANG ${po_dir} NAME)
+        STEP_PROCESS_XML_TRANSLATION(${CURRENT_LANG} ${po_file}
             "--context='%(filename)s:%(tag)s' --tag-regex='^(?:title|body|p|h[1-6])$$' --recursive --strip"
             ALL INSTALL_DESTINATION ${KDE_INSTALL_DATADIR}/step/objinfo
             ${INFO_HTML_FILES})
+    endforeach()
 endif(STEP_BUILD_TRANSLATIONS)
diff --git a/step/data/tutorials/CMakeLists.txt b/step/data/tutorials/CMakeLists.txt
--- a/step/data/tutorials/CMakeLists.txt
+++ b/step/data/tutorials/CMakeLists.txt
@@ -1,18 +1,15 @@
 FILE(GLOB STEP_TUTORIALS_FILES "*.step")
 
+install(FILES
+       ${STEP_TUTORIALS_FILES}
+       DESTINATION  ${KDE_INSTALL_DATADIR}/step/tutorials)
+
 if(STEP_BUILD_TRANSLATIONS)
 
-    set(po_file ${CMAKE_SOURCE_DIR}/messages/kdeedu/step_example_files.po)
+    set(po_file ${CMAKE_SOURCE_DIR}/po/*/step_example_files.po)
     STEP_PROCESS_XML_TRANSLATION(${CURRENT_LANG} ${po_file}
             "--context='%(tag)s' --tag=name --tag=text --unquote --parse-unquoted='--context=HTML:%(tag)s --tag-regex=^(?:title|body|p|h[1-6])$$ --recursive --strip'"
             ALL INSTALL_DESTINATION ${KDE_INSTALL_DATADIR}/step/tutorials
             ${STEP_TUTORIALS_FILES})
-
-else(STEP_BUILD_TRANSLATIONS)
-
-    install(FILES 
-       ${STEP_TUTORIALS_FILES}
-       DESTINATION  ${KDE_INSTALL_DATADIR}/step/tutorials)
-
 endif(STEP_BUILD_TRANSLATIONS)
 
diff --git a/step/infobrowser.cc b/step/infobrowser.cc
--- a/step/infobrowser.cc
+++ b/step/infobrowser.cc
@@ -153,7 +153,10 @@
                     "</body></html>", fromHistory, url );
             return;
         }
-        QString fileName = QStringLiteral(":/objectinfo/%1.html").arg(className.toLower());
+        QString fileName = QStandardPaths::locate(QStandardPaths::DataLocation, QStringLiteral("objinfo/%1/%2.html").arg(QLocale::system().uiLanguages().at(0), className.toLower()));
+        if(fileName.isEmpty()) {
+            fileName = QStringLiteral(":/objectinfo/%1.html").arg(className.toLower());
+        }
         if(!fileName.isEmpty()) {
             QFile file(fileName);
             if(file.open(QIODevice::ReadOnly | QIODevice::Text)) {