merge Evgeny's English and Botum's Spanish translations

1 files changed, 9 insertions, 6 deletions

diff --git a/templates/reopen.html b/templates/reopen.html
index 9d87c3a6..7ab59421 100644
--- a/templates/reopen.html
+++ b/templates/reopen.html
@@ -1,7 +1,9 @@
+<!-- reopen.html -->
 {% extends "base_content.html" %}
 {% load extra_tags %}
+{% load i18n %}
 {% load humanize %}
-{% block title %}{% spaceless %}重设问题{% endspaceless %}{% endblock %}
+{% block title %}{% spaceless %}{% trans "Reopen question" %}{% endspaceless %}{% endblock %}
 {% block forejs %}
        <script type="text/javascript">
         $().ready(function(){
@@ -11,21 +13,21 @@
 {% endblock %}
 {% block content %}
 <div id="main-bar" class="headNormal">
-    重设问题
+	{% trans "Reopen question" %}
 </div>
 <div id="main-body" style="width:100%">
-    <p>你将打开这个已经被关闭的问题： <a href="{{ question.get_absolute_url }}"><span class="big">{{ question.get_question_title }}</span></a>
+    <p>{% trans "Open the previously closed question" %}: <a href="{{ question.get_absolute_url }}"><span class="big">{{ question.get_question_title }}</span></a>
     
     </p>   
-    <p><strong>问题曾以“{{ question.get_close_reason_display }}”的原因被 <a href="{{ question.closed_by.get_profile_url }}">{{ question.closed_by.username }}</a> 于{% diff_date question.closed_at %}<font class="darkred">关闭</font>
+    <p><strong>{% trans "The question was closed for the following reason " %}"{{ question.get_close_reason_display }}"{% trans "reason - leave blank in english" %} <a href="{{ question.closed_by.get_profile_url }}">{{ question.closed_by.username }}</a> {% trans "on "%} {% diff_date question.closed_at %}<font class="darkred">{% trans "date closed" %}</font>
         </strong>
     </p>
     
     <form id="fmclose" action="{% url reopen question.id %}" method="post" >
 
         <div id="" style="padding:20px 0 20px 0">
-            <input type="submit" value="确定打开这个问题" class="submit" />
-            <input id="btBack" type="button" value="取消"  class="submit"  />
+            <input type="submit" value="{% trans "Reopen this question" %}" class="submit" />
+            <input id="btBack" type="button" value="{% trans "Cancel" %}"  class="submit"  />
             
         </div>
         
@@ -35,3 +37,4 @@
 
 
 
+<!-- end reopen.html -->