resolved conflicts

src/main/java/net/gepafin/tendermanagement/config/Translator.java

@@ -22,4 +22,9 @@ public class Translator {
       Locale locale = LocaleContextHolder.getLocale();
       return messageSource.getMessage(msgCode, null, locale);
    }
+
+   public static String toLocale(String key, Object... args) {
+      return messageSource.getMessage(key, args, LocaleContextHolder.getLocale());
+   }
+
 }