diff --git a/devops-service/core/devops-messages.rb b/devops-service/core/devops-messages.rb
index b96c395..eae1f1a 100644
--- a/devops-service/core/devops-messages.rb
+++ b/devops-service/core/devops-messages.rb
@@ -18,13 +18,13 @@ module Devops
         lang = lang_key
         messages = read_file(file)[lang]
         raise "It is undefined main key '#{lang}' in file '#{file}'" if messages.nil?
-        @@messages.merge!(messages)
+        @@messages.deep_merge!(messages)
       end
 
       def translate key, params={}
         msg = @@messages
         key.split(".").each do |msgk|
-          msg = msg[key]
+          msg = msg[msgk]
           raise "Invalid message key '#{key}'" if msg.nil?
         end
         raise "Invalid message value with key '#{key}', it must be a string" unless msg.is_a?(String)