diff --git a/resources/localization/list.txt b/resources/localization/list.txt
index 0fd5289943..bc545b1bf3 100644
--- a/resources/localization/list.txt
+++ b/resources/localization/list.txt
@@ -21,6 +21,7 @@ xs/src/slic3r/GUI/UpdateDialogs.cpp
 xs/src/slic3r/GUI/WipeTowerDialog.cpp
 xs/src/slic3r/Utils/OctoPrint.cpp
 xs/src/slic3r/Utils/PresetUpdater.cpp
+xs/src/libslic3r/Print.cpp
 xs/src/libslic3r/PrintConfig.cpp
 xs/src/libslic3r/GCode/PreviewData.cpp
 lib/Slic3r/GUI.pm
diff --git a/xs/src/libslic3r/I18N.hpp b/xs/src/libslic3r/I18N.hpp
index bc9345f11e..db4fd22dfe 100644
--- a/xs/src/libslic3r/I18N.hpp
+++ b/xs/src/libslic3r/I18N.hpp
@@ -5,11 +5,13 @@
 
 namespace Slic3r {
 
-typedef std::string (*translate_fn_type)(const char*);
-extern translate_fn_type translate_fn;
-inline void set_translate_callback(translate_fn_type fn) { translate_fn = fn; }
-inline std::string translate(const std::string &s) { return (translate_fn == nullptr) ? s : (*translate_fn)(s.c_str()); }
-inline std::string translate(const char *ptr) { return (translate_fn == nullptr) ? std::string(ptr) : (*translate_fn)(ptr); }
+namespace I18N {
+	typedef std::string (*translate_fn_type)(const char*);
+	extern translate_fn_type translate_fn;
+	inline void set_translate_callback(translate_fn_type fn) { translate_fn = fn; }
+	inline std::string translate(const std::string &s) { return (translate_fn == nullptr) ? s : (*translate_fn)(s.c_str()); }
+	inline std::string translate(const char *ptr) { return (translate_fn == nullptr) ? std::string(ptr) : (*translate_fn)(ptr); }
+} // namespace I18N
 
 } // namespace Slic3r
 
diff --git a/xs/src/libslic3r/PrintConfig.cpp b/xs/src/libslic3r/PrintConfig.cpp
index c5e520b4f0..486e6fe183 100644
--- a/xs/src/libslic3r/PrintConfig.cpp
+++ b/xs/src/libslic3r/PrintConfig.cpp
@@ -14,7 +14,7 @@ namespace Slic3r {
 
 //! macro used to mark string used at localization, 
 //! return same string
-#define L(s) translate(s)
+#define L(s) Slic3r::I18N::translate(s)
 
 PrintConfigDef::PrintConfigDef()
 {
diff --git a/xs/src/libslic3r/utils.cpp b/xs/src/libslic3r/utils.cpp
index 2d177da3cc..991118c149 100644
--- a/xs/src/libslic3r/utils.cpp
+++ b/xs/src/libslic3r/utils.cpp
@@ -125,7 +125,7 @@ const std::string& localization_dir()
 }
 
 // Translate function callback, to call wxWidgets translate function to convert non-localized UTF8 string to a localized one.
-translate_fn_type translate_fn = nullptr;
+Slic3r::I18N::translate_fn_type Slic3r::I18N::translate_fn = nullptr;
 
 static std::string g_data_dir;
 
diff --git a/xs/src/slic3r/GUI/GUI.cpp b/xs/src/slic3r/GUI/GUI.cpp
index e2f3925fcb..825c37dced 100644
--- a/xs/src/slic3r/GUI/GUI.cpp
+++ b/xs/src/slic3r/GUI/GUI.cpp
@@ -56,7 +56,7 @@
 
 #include "../Utils/PresetUpdater.hpp"
 #include "../Config/Snapshot.hpp"
-
+#include "libslic3r/I18N.hpp"
 
 namespace Slic3r { namespace GUI {
 
@@ -149,9 +149,13 @@ void update_label_colours_from_appconfig()
 	}
 }
 
+static std::string libslic3r_translate_callback(const char *s) { return wxGetTranslation(wxString(s, wxConvUTF8)); }
+
 void set_wxapp(wxApp *app)
 {
     g_wxApp = app;
+    // Let the libslic3r know the callback, which will translate messages on demand.
+	Slic3r::I18N::set_translate_callback(libslic3r_translate_callback);
     init_label_colours();
 }
 
diff --git a/xs/src/slic3r/GUI/GUI.hpp b/xs/src/slic3r/GUI/GUI.hpp
index 2853544462..83052cb6e3 100644
--- a/xs/src/slic3r/GUI/GUI.hpp
+++ b/xs/src/slic3r/GUI/GUI.hpp
@@ -33,11 +33,14 @@ class PresetUpdater;
 class DynamicPrintConfig;
 class TabIface;
 
-#define _(s)    Slic3r::translate((s))
-inline wxString translate(const char *s)    	 { return wxGetTranslation(wxString(s, wxConvUTF8)); }
-inline wxString translate(const wchar_t *s) 	 { return wxGetTranslation(s); }
-inline wxString translate(const std::string &s)  { return wxGetTranslation(wxString(s.c_str(), wxConvUTF8)); }
-inline wxString translate(const std::wstring &s) { return wxGetTranslation(s.c_str()); }
+#define _(s)    Slic3r::GUI::I18N::translate((s))
+
+namespace GUI { namespace I18N {
+	inline wxString translate(const char *s)    	 { return wxGetTranslation(wxString(s, wxConvUTF8)); }
+	inline wxString translate(const wchar_t *s) 	 { return wxGetTranslation(s); }
+	inline wxString translate(const std::string &s)  { return wxGetTranslation(wxString(s.c_str(), wxConvUTF8)); }
+	inline wxString translate(const std::wstring &s) { return wxGetTranslation(s.c_str()); }
+} }
 
 // !!! If you needed to translate some wxString,
 // !!! please use _(L(string))