4 files changed, 14 insertions, 15 deletions
diff --git a/redmine/app/views/enumerations/_form.rhtml b/redmine/app/views/enumerations/_form.rhtml
index d78dc358c..280eebfbd 100644
--- a/redmine/app/views/enumerations/_form.rhtml
+++ b/redmine/app/views/enumerations/_form.rhtml
@@ -3,7 +3,7 @@
 <!--[form:optvalue]-->
 <%= hidden_field 'enumeration', 'opt'  %>
 
-<p><label for="enumeration_name"><%=_('Name')%></label><br/>
+<p><label for="enumeration_name"><%=l(:field_name)%></label><br/>
 <%= text_field 'enumeration', 'name'  %></p>
 <!--[eoform:optvalue]-->
 
diff --git a/redmine/app/views/enumerations/edit.rhtml b/redmine/app/views/enumerations/edit.rhtml
index 16bd377f3..5c26414eb 100644
--- a/redmine/app/views/enumerations/edit.rhtml
+++ b/redmine/app/views/enumerations/edit.rhtml
@@ -1,10 +1,10 @@
-<h2><%=_('Enumerations')%></h2>
+<h2><%=l(:label_enumerations)%></h2>
 
 <%= start_form_tag :action => 'update', :id => @enumeration %>
   <%= render :partial => 'form' %>
-  <%= submit_tag _('Save') %>
+  <%= submit_tag l(:button_save) %>
 <%= end_form_tag %>
 
 <%= start_form_tag :action => 'destroy', :id => @enumeration %>
-  <%= submit_tag _('Delete') %>
+  <%= submit_tag l(:button_delete) %>
 <%= end_form_tag %>
 \ No newline at end of file
diff --git a/redmine/app/views/enumerations/list.rhtml b/redmine/app/views/enumerations/list.rhtml
index b5ce65c23..15b91c1ac 100644
--- a/redmine/app/views/enumerations/list.rhtml
+++ b/redmine/app/views/enumerations/list.rhtml
@@ -1,22 +1,21 @@
-<h2><%=_('Enumerations')%></h2>
+<h2><%=l(:label_enumerations)%></h2>
 
-<% for option in Enumeration::OPTIONS %>
+<% Enumeration::OPTIONS.each do |option, name| %>
 
-	<% if @params[:opt]==option[1] %>	
+	<% if @params[:opt]==option %>	
   
-		<p><%= image_tag 'dir_open' %> <b><%=_ option[0] %></b></p>		
+		<p><%= image_tag 'dir_open' %> <b><%= l(name) %></b></p>		
 		<ul>
-		<% for value in Enumeration::find(:all, :conditions => [ "opt = ?", option[1]]) %>			
+		<% for value in Enumeration.find(:all, :conditions => ["opt = ?", option]) %>			
 			<li><%= link_to value.name, :action => 'edit', :id => value %></li>	
 		<% end %>
     </ul>
     <ul>
-      <li><%= link_to ('&#187; ' + _('New')), :action => 'new', :opt => option[1] %></li>
+      <li><%= link_to ('&#187; ' + l(:label_new)), :action => 'new', :opt => option %></li>
     </ul>
     
 	<% else %>	
-		<p><%= image_tag 'dir' %> <%= link_to _(option[0]), :opt => option[1] %></p>		
+		<p><%= image_tag 'dir' %> <%= link_to l(name), :opt => option %></p>		
 	<% end %>
   
-<% end %>
-
+<% end %>
+\ No newline at end of file
diff --git a/redmine/app/views/enumerations/new.rhtml b/redmine/app/views/enumerations/new.rhtml
index 30048f2fd..87ede016c 100644
--- a/redmine/app/views/enumerations/new.rhtml
+++ b/redmine/app/views/enumerations/new.rhtml
@@ -1,6 +1,6 @@
-<h2><%=_('New enumeration')%></h2>
+<h2><%=l(:label_enumeration_new)%></h2>
 
 <%= start_form_tag :action => 'create' %>
   <%= render :partial => 'form' %>
-  <%= submit_tag _('Create') %>
+  <%= submit_tag l(:button_create) %>
 <%= end_form_tag %>