Merged r10745 from trunk (#12231).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10824 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/common/error.html.erb b/app/views/common/error.html.erb
index 77ead9df4281dbec9603908c5ac8988c7139b4ae..5bb43dea0ec877365642f683669010123eacc5f3 100644 (file)
--- a/app/views/common/error.html.erb
+++ b/app/views/common/error.html.erb
@@ -3,6 +3,6 @@
 <% if @message.present? %>
   <p id="errorExplanation"><%=h @message %></p>
 <% end %>
-<p><a href="javascript:history.back()">Back</a></p>
+<p><a href="javascript:history.back()"><%= l(:button_back) %></a></p>
 
 <% html_title @status %>