diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a6261b..e5f6e8c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.10)
-if(${CMAKE_VERSION} VERSION_GREATER "3.14")
+if (${CMAKE_VERSION} VERSION_GREATER "3.14")
     cmake_policy(SET CMP0087 NEW)
-endif()
+endif ()
 set(CMAKE_MODULE_PATH "${CMAKE_BINARY_DIR}" ${CMAKE_MODULE_PATH})
 include(FeatureSummary)
 
@@ -19,8 +19,6 @@ SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${RUNTIME_OUTPUT_DIRECTORY})
 
 project(Fuel VERSION "2.0.0")
 
-option(UPDATE_TRANSLATIONS "Update translations" OFF)
-
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
@@ -83,12 +81,8 @@ set(HEADERS
         src/AboutDialog.h
         src/WorkspaceCommon.h)
 
-
-file(COPY rsrc/languages.qrc DESTINATION ${CMAKE_BINARY_DIR}/intl)
-
 set(RESOURCES
-        rsrc/resources.qrc
-        ${CMAKE_BINARY_DIR}/intl/languages.qrc)
+        rsrc/resources.qrc)
 
 set(TRANSLATIONS
         intl/en_US.ts
@@ -102,15 +96,18 @@ set(TRANSLATIONS
         intl/nl_NL.ts
         intl/ko_KR.ts)
 
-set_source_files_properties(${TRANSLATIONS} PROPERTIES OUTPUT_LOCATION "intl")
 
 find_package(Qt5LinguistTools)
 if (Qt5LinguistTools_FOUND)
-    if (UPDATE_TRANSLATIONS)
-        qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR}/ui ${CMAKE_SOURCE_DIR}/src ${TRANSLATIONS})
-    else ()
-        qt5_add_translation(QM_FILES ${TRANSLATIONS})
-    endif ()
+    set_source_files_properties(${TRANSLATIONS} PROPERTIES OUTPUT_LOCATION "intl")
+
+    qt5_create_translation(QM_MESSAGES ${CMAKE_SOURCE_DIR}/ui ${CMAKE_SOURCE_DIR}/src ${TRANSLATIONS})
+    qt5_add_translation(QM_FILES ${TRANSLATIONS})
+    add_custom_target(messages DEPENDS ${QM_MESSAGES})
+    add_custom_target(translations DEPENDS ${QM_FILES} messages)
+
+    file(COPY rsrc/languages.qrc DESTINATION ${CMAKE_BINARY_DIR}/intl)
+    list(APPEND RESOURCES "${CMAKE_BINARY_DIR}/intl/languages.qrc")
 else ()
     message("Qt5LinguistTools not found")
 endif ()
@@ -148,6 +145,10 @@ endif ()
 
 target_compile_definitions(${PROJECT_NAME} PRIVATE FUEL_VERSION="${PROJECT_VERSION}")
 
+if (Qt5LinguistTools_FOUND)
+    add_dependencies(${PROJECT_NAME} translations)
+endif ()
+
 
 # ------------------------------------------------------------------------------------------------#
 # Cpack
@@ -209,20 +210,20 @@ if (WIN32)
     set(CPACK_MODULE_PATH "")
 endif ()
 
-if(UNIX)
+if (UNIX)
     install(
-        TARGETS ${PROJECT_NAME}
-        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+            TARGETS ${PROJECT_NAME}
+            RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
     )
     install(
-        FILES ${CMAKE_SOURCE_DIR}/rsrc/fuel.desktop
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/applications/
+            FILES ${CMAKE_SOURCE_DIR}/rsrc/fuel.desktop
+            DESTINATION ${CMAKE_INSTALL_DATADIR}/applications/
     )
     install(
-        FILES ${CMAKE_SOURCE_DIR}/rsrc/icons/fuel.png
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/pixmaps/
+            FILES ${CMAKE_SOURCE_DIR}/rsrc/icons/fuel.png
+            DESTINATION ${CMAKE_INSTALL_DATADIR}/pixmaps/
     )
-endif()
+endif ()
 
 include(CPack)
 
diff --git a/intl/nl_NL.ts b/intl/nl_NL.ts
index 6ba1ba6..dd2f84d 100644
--- a/intl/nl_NL.ts
+++ b/intl/nl_NL.ts
@@ -1672,7 +1672,7 @@ De volgende bestanden worden verplaatst naar het archief.</translation>
         <location filename="../ui/RemoteDialog.ui" line="17"/>
         <location filename="../ui/RemoteDialog.ui" line="31"/>
         <source>Remote Repository</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Externe Repository</translation>
     </message>
     <message>
         <location filename="../ui/RemoteDialog.ui" line="40"/>