diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index c204bac..e3865d4 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,6 +1,6 @@
 module ApplicationHelper
-  def t_hint(attribute_key, class_key=nil)
+  def t_hint(attribute_key, class_key=nil, options={})
     class_key ||= controller_name.singularize
-    t("activemodel.hints.#{class_key}.#{attribute_key}")
+    t("activemodel.hints.#{class_key}.#{attribute_key}", options)
   end
 end
diff --git a/app/views/devise/_links.erb b/app/views/devise/_links.erb
index b302f36..6456af2 100644
--- a/app/views/devise/_links.erb
+++ b/app/views/devise/_links.erb
@@ -1,3 +1,4 @@
+<%# This file was autogenerated by devise-i18n-views and is not used %>
 <% ActiveSupport::Deprecation.warn "Rendering partials devise/_links.erb is deprecated" \
   "please use devise/shared/_links.erb instead."%>
-<%= render "shared/links" %>
\ No newline at end of file
+<%= render "shared/links" %>
diff --git a/app/views/kalibro_ranges/_form.html.erb b/app/views/kalibro_ranges/_form.html.erb
index 6f98274..18ba545 100644
--- a/app/views/kalibro_ranges/_form.html.erb
+++ b/app/views/kalibro_ranges/_form.html.erb
@@ -13,7 +13,7 @@
         </div>
         <div class="help-container">
           <p>
-            <%= t('activemodel.hints.kalibro_range.reading',
+            <%= t_hint('reading', 'kalibro_range',
                   reading_href: link_to(t('reading'), tutorials_path('keywords', anchor: 'reading')),
                   range_href: link_to(KalibroRange.model_name.human, tutorials_path('keywords', anchor: 'range'))
                  ).html_safe
@@ -36,7 +36,7 @@
 
         <div class="help-container">
           <p>
-            <%= t('activemodel.hints.kalibro_range.beginning') %>
+            <%= t_hint('beginning', 'kalibro_range') %>
           </p>
         </div>
       </div>
@@ -53,7 +53,7 @@
         </div>
         <div class="help-container">
           <p>
-            <%= t('activemodel.hints.kalibro_range.end') %>
+            <%= t_hint('end', 'kalibro_range') %>
           </p>
         </div>
       </div>
@@ -65,7 +65,7 @@
         </div>
         <div class="help-container">
           <p>
-            <%= t('activemodel.hints.kalibro_range.comments', metric_href: link_to(t('metric'), tutorials_path('keywords', anchor: 'metric'))).html_safe %>
+            <%= t_hint('comments', 'kalibro_range', metric_href: link_to(t('metric'), tutorials_path('keywords', anchor: 'metric'))).html_safe %>
           </p>
         </div>
       </div>
diff --git a/config/locales/default/en.yml b/config/locales/default/en.yml
index 8426807..2af1d33 100644
--- a/config/locales/default/en.yml
+++ b/config/locales/default/en.yml
@@ -31,6 +31,7 @@ en:
   Project: "Project"
   Reading: "Reading"
   metric: 'Metric'
+  Configuration: "Configuration"
 
   compound: "Compound"
 
diff --git a/config/locales/default/pt.yml b/config/locales/default/pt.yml
index 02912ae..a9c9c69 100644
--- a/config/locales/default/pt.yml
+++ b/config/locales/default/pt.yml
@@ -10,6 +10,7 @@ pt:
   Project: "Projeto"
   Reading: "Leitura"
   metric: 'Métrica'
+  Configuration: "Configuração"
 
   compound: "Composta"
 
diff --git a/config/locales/views/devise/en.yml b/config/locales/views/devise/en.yml
index b3c135f..1ce22b4 100644
--- a/config/locales/views/devise/en.yml
+++ b/config/locales/views/devise/en.yml
@@ -8,6 +8,7 @@ en:
   activerecord:
     attributes:
       user:
+        name: Name
         current_password: Current password
         email: Email
         password: Password
@@ -72,6 +73,9 @@ en:
         same_email: *same_email
         forgot_password_link_html: If you forgot your password, follow this %{link} to reset it.
         stay_logged_in: Stay logged in.
+      user:
+        signed_in: Signed in successfully.
+        signed_out: Signed out successfully.
     shared:
       links:
         back: Back
diff --git a/config/locales/views/devise/pt.yml b/config/locales/views/devise/pt.yml
index f5df63c..534213a 100644
--- a/config/locales/views/devise/pt.yml
+++ b/config/locales/views/devise/pt.yml
@@ -8,6 +8,7 @@ pt:
   activerecord:
     attributes:
       user:
+        name: Nome
         current_password: Senha atual
         email: Email
         password: Senha
@@ -16,6 +17,9 @@ pt:
     models:
       user: Usuário
   devise:
+    failure:
+      user:
+        invalid: Email ou senha inválidos.
     confirmations:
       new:
         resend_confirmation_instructions: Reenviar instruções de confirmação
@@ -72,6 +76,9 @@ pt:
         same_email: *same_email
         forgot_password_link_html: Se você esqueceu sua senha, clique neste %{link} para redefini-la.
         stay_logged_in: Continuar logado.
+      user:
+        signed_in: Entrou com sucesso.
+        signed_out: Saiu com sucesso.
     shared:
       links:
         back: Voltar
--
libgit2 0.21.2