diff --git a/pym/cl_apply_template.py b/pym/cl_apply_template.py
index e408f8e..b2edede 100644
--- a/pym/cl_apply_template.py
+++ b/pym/cl_apply_template.py
@@ -26,9 +26,7 @@ from cl_template import template, templateClt
 from cl_print import color_print
 
 from cl_lang import lang
-tr = lang()
-tr.setGlobalDomain('cl_install')
-tr.setLanguage(sys.modules[__name__])
+lang().setLanguage(sys.modules[__name__])
 #sys.path.insert(0, "/usr/lib/calculate-2.2/calculate-lib/pym")
 
 #packagePath = "/usr/lib/calculate-2.2"
diff --git a/pym/cl_distr.py b/pym/cl_distr.py
index a9e9fe3..82a3921 100644
--- a/pym/cl_distr.py
+++ b/pym/cl_distr.py
@@ -32,6 +32,9 @@ from cl_fill import fillVars
 
 import threading
 
+from cl_lang import lang
+lang().setLanguage(sys.modules[__name__])
+
 class Spinner(threading.Thread):
     stopSignal = threading.Event()
     sequence= map(lambda x:x,iter("/-\\|"))
diff --git a/pym/cl_install.py b/pym/cl_install.py
index 7627856..5a9cc93 100644
--- a/pym/cl_install.py
+++ b/pym/cl_install.py
@@ -65,9 +65,8 @@ from cl_utils import getUserPassword
 from encrypt import encrypt
 from shutil import copy2
 
-tr = lang()
-tr.setGlobalDomain('cl_install')
-tr.setLanguage(sys.modules[__name__])
+from cl_lang import lang
+lang().setLanguage(sys.modules[__name__])
 
 class InstallError(Exception):
     """Installation Error"""