diff --git a/app/views/compound_metric_configurations/_created_metrics.html.erb b/app/views/compound_metric_configurations/_created_metrics.html.erb
index 0f5c14b..71df029 100644
--- a/app/views/compound_metric_configurations/_created_metrics.html.erb
+++ b/app/views/compound_metric_configurations/_created_metrics.html.erb
@@ -1,14 +1,14 @@
 <div id="created-metrics-accordion">
-  <h3 class="jquery-ui-accordion"> Created Metrics </h3>
+  <h3 class="jquery-ui-accordion"> <%= t('created_metrics') %> </h3>
   <div>
   <table class="table table-hover">
     <thead>
-      <th>Name</th>
-      <th>Code</th>
+      <th> <%= t('name') %> </th>
+      <th> <%= t('code') %> </th>
     </thead>
     <tbody>
       <%= render partial: 'created_metric', collection: metric_configurations, as: 'metric_configuration' %>
     </tbody>
   </table>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/compound_metric_configurations/_form.html.erb b/app/views/compound_metric_configurations/_form.html.erb
index 715966b..f1ed313 100644
--- a/app/views/compound_metric_configurations/_form.html.erb
+++ b/app/views/compound_metric_configurations/_form.html.erb
@@ -13,7 +13,7 @@
       </div>
       <div class="help-container">
         <p>
-          It is used to calculate the weighted average of a <%= link_to 'module',  tutorials_path("keywords", anchor: "module")%>'s grade.
+          <%= t('calculate_weighted_average') %> <%= link_to t('module'),  tutorials_path("keywords", anchor: "module")%> <%= t('grades_belonging_to_a_module') %>
         </p>
       </div>
     </div>
@@ -25,19 +25,19 @@
     <% else %>
       <div class="form-row">
         <div class="field-container">
-          <%= f.label :reading_group_id, 'Reading Group', class: 'control-label' %>
+          <%= f.label :reading_group_id, t('reading_group'), class: 'control-label' %>
           <%= f.select( :reading_group_id, reading_group_options, {class: 'form-control'} ) %>
         </div>
         <div class="help-container">
           <p>
-            The <%= link_to 'Reading Group', tutorials_path('keywords', anchor: 'reading_group') %> associated with this metric.
+            <%= t('the') %> <%= link_to  t('reading_group'), tutorials_path('keywords', anchor: 'reading_group') %>  <%= t('associated_metric_configuration_form') %>
           </p>
         </div>
       </div>
       <%= f.hidden_field(:kalibro_configuration_id, value: @kalibro_configuration_id) %>
-      <%= link_to 'Back', kalibro_configuration_path(@kalibro_configuration_id), class: 'btn btn-default' %>
+      <%= link_to t('back'), kalibro_configuration_path(@kalibro_configuration_id), class: 'btn btn-default' %>
     <% end %>
   </div>
 </div>
 <br>
-<%= f.submit 'Save', class: 'btn btn-primary' %>
+<%= f.submit t('save'), class: 'btn btn-primary' %>
diff --git a/app/views/compound_metric_configurations/_metric_options.html.erb b/app/views/compound_metric_configurations/_metric_options.html.erb
index 3536747..20f43df 100644
--- a/app/views/compound_metric_configurations/_metric_options.html.erb
+++ b/app/views/compound_metric_configurations/_metric_options.html.erb
@@ -5,7 +5,7 @@
       </div>
       <div class="help-container">
         <p>
-          A custom name for your compound metric.
+          <%= t('body1_compound_metric_options') %>
         </p>
       </div>
     </div>
@@ -17,7 +17,7 @@
       </div>
       <div class="help-container">
         <p>
-          A short description of your compound metric.
+          <%= t('body2_compound_metric_options') %>
         </p>
       </div>
     </div>
@@ -29,7 +29,7 @@
       </div>
       <div class="help-container">
         <p>
-          A mathematical expression (in javascript) to calculate your compound metric. It needs a return statement. The codes of already created metrics can be used inside the script.
+          <%= t('body3_compound_metric_options') %>
         </p>
       </div>
     </div>
@@ -41,7 +41,7 @@
       </div>
       <div class="help-container">
         <p>
-          The <%= link_to 'granularity', tutorials_path("keywords", anchor: "granularity")%> of the <%= link_to 'modules',  tutorials_path("keywords", anchor: "module")%> measured by this metric.
+          <%= t('the') %> <%= link_to t('granularity'), tutorials_path('keywords', anchor: "granularity")%>  <%= t('of_the') %>  <%= link_to t('modules'),  tutorials_path( 'keywords', anchor: 'module' )%>  <%= t('measured_metric') %>
         </p>
       </div>
     </div>
diff --git a/app/views/compound_metric_configurations/edit.html.erb b/app/views/compound_metric_configurations/edit.html.erb
index 1a76970..382954a 100644
--- a/app/views/compound_metric_configurations/edit.html.erb
+++ b/app/views/compound_metric_configurations/edit.html.erb
@@ -1,6 +1,6 @@
 <div class="page-header">
-  <h1>Edit Compound Metric Configuration</h1>
-</div>
+  <h1> <%= t('title_compound_edit') %> </h1>
+</div
 
 <%= render partial: 'created_metrics', locals: {metric_configurations: @metric_configurations} %>
 
diff --git a/app/views/compound_metric_configurations/new.html.erb b/app/views/compound_metric_configurations/new.html.erb
index 36335c8..d296321 100644
--- a/app/views/compound_metric_configurations/new.html.erb
+++ b/app/views/compound_metric_configurations/new.html.erb
@@ -1,5 +1,5 @@
 <div class="page-header">
-  <h1>New Compound Metric Configuration</h1>
+  <h1> <%= t('title_compound_new') %> </h1>
 </div>
 
 <%= render partial: 'created_metrics', locals: {metric_configurations: @metric_configurations} %>
diff --git a/app/views/compound_metric_configurations/show.html.erb b/app/views/compound_metric_configurations/show.html.erb
index 4cf489c..6c9adb3 100644
--- a/app/views/compound_metric_configurations/show.html.erb
+++ b/app/views/compound_metric_configurations/show.html.erb
@@ -3,58 +3,58 @@
 </div>
 
 <p>
-  <strong>Description:</strong>
+  <strong> <%= t('description') %>:</strong>
   <% if @compound_metric_configuration.metric.description.nil? %>
-    <%= "There is no description available." %>
+    <%= t('no_description') %>
   <% else %>
     <%= @compound_metric_configuration.metric.description %>
   <% end %>
 </p>
 
 <p>
-  <strong>Script:</strong>
+  <strong> <%= t('script') %>:</strong>
   <%= @compound_metric_configuration.metric.script %>
 </p>
 
 <p>
-  <strong>Scope:</strong>
+  <strong> <%= t('scope') %>:</strong>
   <%= @compound_metric_configuration.metric.scope %>
 </p>
 
 <p>
-  <strong>Code:</strong>
+  <strong> <%= t('code') %>:</strong>
   <%= @compound_metric_configuration.metric.code %>
 </p>
 
 <p>
-  <strong>Weight:</strong>
+  <strong> <%= t('weight') %>:</strong>
   <%= @compound_metric_configuration.weight %>
 </p>
 
 <p>
-  <strong>Aggregation Form:</strong>
+  <strong> <%= t('metric_configurations_aggregation') %>:</strong>
   <%= @compound_metric_configuration.aggregation_form %>
 </p>
 
 <p>
-  <strong>Reading Group Name:</strong>
+  <strong> <%= t('metric_configurations_reading_group') %>:</strong>
   <%= @reading_group.name %>
 </p>
 
 <hr>
 
-<h2> Ranges </h2>
+<h2>  <%= t('ranges') %> </h2>
 <% if kalibro_configuration_owner? @compound_metric_configuration.kalibro_configuration_id %>
-  <%= link_to 'Add Range', kalibro_configuration_metric_configuration_new_kalibro_range_path(@compound_metric_configuration.kalibro_configuration_id,
+  <%= link_to t('add_range'), kalibro_configuration_metric_configuration_new_kalibro_range_path(@compound_metric_configuration.kalibro_configuration_id,
       @compound_metric_configuration.id), class: 'btn btn-info' %>
 <% end %>
 
 <table class="table table-hover">
   <thead>
     <tr>
-      <th>Label</th>
-      <th>Beginning</th>
-      <th>End</th>
+      <th> <%= t('label') %> </th>
+      <th> <%= t('beginning') %> </th>
+      <th> <%= t('end') %> </th>
     </tr>
   </thead>
   <tbody>
@@ -69,10 +69,10 @@
 <hr>
 
 <p>
- <%= link_to 'Back', kalibro_configuration_path(@compound_metric_configuration.kalibro_configuration_id), class: 'btn btn-default' %>
+ <%= link_to t('back'), kalibro_configuration_path(@compound_metric_configuration.kalibro_configuration_id), class: 'btn btn-default' %>
 <% if kalibro_configuration_owner? @compound_metric_configuration.kalibro_configuration_id %>
-      <%= link_to 'Destroy Metric Configuration', kalibro_configuration_metric_configuration_path(@compound_metric_configuration.kalibro_configuration_id,
-      @compound_metric_configuration.id), method: :delete, data: { confirm: 'Are you sure that you want to destroy this Metric Configuration?' },
+      <%= link_to t('destroy_metric_configuration'), kalibro_configuration_metric_configuration_path(@compound_metric_configuration.kalibro_configuration_id,
+      @compound_metric_configuration.id), method: :delete, data: { confirm: t('sure_destroy_metric_configuration') },
       class: 'btn btn-danger' %>
  <% end %>
 </p>
diff --git a/config/application.rb b/config/application.rb
index 0fbdde1..3264903 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -17,7 +17,8 @@ module Mezuro
     # config.time_zone = 'Central Time (US & Canada)'
 
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    config.i18n.load_path += Dir[Rails.root.join('config', 'locales/views', '*.{rb,yml}').to_s]
+    config.i18n.load_path += Dir[Rails.root.join('config', 'locales/controllers', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
     config.i18n.enforce_available_locales = true
 
diff --git a/config/locales/views/en.yml b/config/locales/views/en.yml
index 6efe3a4..22be0db 100644
--- a/config/locales/views/en.yml
+++ b/config/locales/views/en.yml
@@ -35,8 +35,8 @@ en:
   and: "and"
   name: "Name"
   label: "Label"
-  scope: "Scope:"
-  code: "Code:"
+  scope: "Scope"
+  code: "Code"
   reading_group: "Reading Group"
   reading_groups: "Reading Groups"
   project: "Project"
@@ -45,7 +45,7 @@ en:
   configurations: "Configurations"
   edit_account: "Edit Account"
   module: "Module"
-  weight: "Weight:"
+  weight: "Weight"
   description: "Description"
   beginning: "Beginning"
   ranges: "Ranges"
@@ -62,7 +62,7 @@ en:
   repositories: "Repositories"
   type: "Type"
   address: "Address"
-  script: "Script:"
+  script: "Script"
   add_range: "Add Range"
   back: "Back"
   destroy: "Destroy"
@@ -130,8 +130,8 @@ en:
   metric_configuration_name: "Metric Name:"
   metric_configurations_description: "Metric Description:"
   metric_configurations_base_tool_name: "Base Tool Name:"
-  metric_configurations_aggregation: "Aggregation Form:"
-  metric_configurations_reading_group: "Reading Group Name:"
+  metric_configurations_aggregation: "Aggregation Form"
+  metric_configurations_reading_group: "Reading Group Name"
   created_metrics: "Created Metrics" 
   resend_instruction: "Resend confirmation instructions"
   confirm_account_email: "You can confirm your account email through the link below:"
@@ -155,14 +155,15 @@ en:
   reset_it: "to reset it."
   stay_logged: "Stay logged in."
   resend_unclok_instructions: "Resend unlock instructions"
-  grade: "'s Grade."
+  grade: "Grade"
+  grades_belonging_to_a_module: "'s Grades"
   edit_configuration: "Edit Configuration"
   must_logged_configuration: "You must be logged in to create new Configurations."
   new_configuration: "New Configuration"
   measured_metric: "measured by this metric."
   change_password: "Change your password "
   no_metric_configurations: "There are no Metric Configurations yet!"
-  calculate_weighted_average: "It is used to calculate the weighted average of a "
+  calculate_weighted_average: "It is used to calculate the weighted average of the "
   range_lower_limit: "This Range's lower limit."
   range_upper_limit: "This Range's upper limit."
   explanation_chose_interval: "An explanation of why you chose this interval, with that reading for this"
diff --git a/config/locales/views/pt.yml b/config/locales/views/pt.yml
index 83f2ea9..3044f28 100644
--- a/config/locales/views/pt.yml
+++ b/config/locales/views/pt.yml
@@ -30,11 +30,11 @@ pt:
   edit: "Editar"
   edit_user: "Editar Usuário"
   end: "Fim"
-  the: "a"
-  of_the: "do"
+  the: "A"
+  of_the: "dos"
   and: "e"
   name: "Nome"
-  label: "Legenda"
+  label: "Rótulo"
   scope: "Escopo"
   code: "Código"
   reading_group: "Grupo de Leitura"
@@ -45,7 +45,7 @@ pt:
   configurations: "Configurações"
   edit_account: "Editar Conta"
   module: "Módulo"
-  weight: "Peso:"
+  weight: "Peso"
   description: "Descrição"
   beginning: "Início"
   range: "Intervalo"
@@ -62,8 +62,8 @@ pt:
   repositories: "Repositórios"
   type: "Tipo"
   address: "Endereço"
-  script: "Script:"
-  add_range: "Adicionando Intervalo"
+  script: "Script"
+  add_range: "Adicionar Intervalo"
   back: "Voltar"
   destroy: "Destruir"
   save: "Salvar"
@@ -112,9 +112,9 @@ pt:
   body2_compound_form: " <p>Ele é usado para calcular a média ponderada de um"
   body1_compound_metric_options: "Um nome personalizado para a sua métrica composta."
   body2_compound_metric_options: "Uma breve descrição de sua métrica composta."
-  body3_compound_metric_options: "A expressão matemática (em javascript) para calcular a sua métrica composta. Ela precisa de uma instrução de retorno. Os códigos de métricas já criados podem ser usados ​​dentro do script. "
-  title_compound_edit: "Editar métrica composta de configuração"
-  title_compound_new: "Nova métrica composta de configuração"
+  body3_compound_metric_options: "A expressão matemática (em javascript) para calcular a sua métrica composta. Ela precisa de uma instrução de retorno (por exemplo, 'return resultado;'). Os códigos de métricas já criadas podem ser usados dentro do script."
+  title_compound_edit: "Editar Configuração de Métrica Composta"
+  title_compound_new: "Nova Configuração de Métrica Composta"
   weighted_average_metric_configurations_form:  "Ele é usado para calcular a média ponderada de um"
   statistical_result_metric_configurations_form: "É o cálculo dos resultados estatísticos para maior"
   modules_eg_metric_configurations_form: "módulos (por exemplo, as linhas médias de código das classes dentro de um pacote)."
@@ -127,9 +127,9 @@ pt:
   metric_configuration_name: "Nome da Métrica:"
   metric_configurations_description: "Descrição da métrica:"
   metric_configurations_base_tool_name: "Nome da ferramenta base:"
-  metric_configurations_aggregation: "Forma de Agregação:"
-  metric_configurations_reading_group: "Nome do grupo:"
-  created_metrics: "Criando Métricas" 
+  metric_configurations_aggregation: "Forma de Agregação"
+  metric_configurations_reading_group: "Nome do grupo"
+  created_metrics: "Métricas Criadas"
   resend_instruction: "Reenviar instruções de confirmação"
   confirm_account_email: "Você pode confirmar a sua conta de e-mail através do link abaixo:"
   request_change_password: "Alguém pediu um link para alterar sua senha. Você pode fazer isso através do link abaixo:"
@@ -153,11 +153,12 @@ pt:
   stay_logged: "Fique conectado."
   resend_unclok_instructions: "Reenviar instruções para desbloquear"
   grade: "Nota"
+  grades_belonging_to_a_module: "através de suas Notas"
   edit_configuration: "Editar configurações"
   must_logged_configuration: "Você precisa estar logado para criar novas configurações."
   new_configuration: "Nova Configuração"
-  calculate_weighted_average: "Ele é usado para calcular a média ponderada de um"
-  measured_metric: "medido por essa métrica."
+  calculate_weighted_average: "Ele é usado para calcular a média ponderada de um "
+  measured_metric: "medidos por essa métrica."
   change_password: "Mude sua senha"
   no_metric_configurations: "Não há configurações de métricas ainda!"
   range_lower_limit: "Limite de intervalo inferior."
@@ -175,8 +176,8 @@ pt:
   edit_reading_group: "Edite Grupos de Leitura"
   must_logged_create_reading_groups: "Você precisa estar logado para criar novos grupos de leitura."
   new_reading_group: "Novo Grupo de Leitura"
-  destroy_metric_configuration: "Destrói Configuração de Métrica"
-  sure_destroy_metric_configuration: "Tem certeza que você quer destruir esta configuração de métrica?"
+  destroy_metric_configuration: "Destruir Configuração de Métrica"
+  sure_destroy_metric_configuration: "Tem certeza que você quer destruir esta Configuração de Métrica?"
   confirm_my_account: "Confirme sua conta"
   change_my_password: "Alterar a senha"
   unlock_my_account: "Desbloquear a minha conta"
--
libgit2 0.21.2