From 068bb7dc78d0b3565c100b61acc859ede0adc0d4 Mon Sep 17 00:00:00 2001
From: Mike Chen <chagel@gmail.com>
Date: Wed, 29 Jul 2009 00:00:52 +0800
Subject: merge Evgeny's English and Botum's Spanish translations

---
 templates/404.html | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'templates/404.html')

diff --git a/templates/404.html b/templates/404.html
index 02725854..d24edaf0 100644
--- a/templates/404.html
+++ b/templates/404.html
@@ -1,4 +1,6 @@
+<!-- template 404.html -->
 {% extends "base_content.html" %}
+{% load i18n %}
 {% block title %}{% spaceless %}404 Error{% endspaceless %}{% endblock %}
 {% block forestyle%}
     <style type="text/css">
@@ -19,30 +21,29 @@
 </div>
 <div id="main-body" class="">
     <div style="padding:5px 0px 10px 0;line-height:25px;">
-        <h3>对不起，没有找到您请求的页面！</h3>
+        <h3>{% trans "Sorry, could not find the page you requested." %}</h3>
         <div style="margin-top:5px">
-        有可能是以下原因导致：<br>
+        {% trans "This might have happened for the following reasons:" %}<br>
         <ul>
-            <li>你正在查看的问题或者回答已经被删除；</li>
-            <li>请求的地址有误 - 请核实原始URL地址；</li>
-            <li>访问的页面被保护或你的积分不够，参见<a href="/faq"> faq</a>；</li>
-            <li>如果你确信不该出现404错误，请<a href="http://cnprog.uservoice.com/" target="_blank">报告这个问题</a></li>
+            <li>{% trans "this question or answer has been deleted;" %}</li>
+            <li>{% trans "url has error - please check it;" %}</li>
+            <li>{% trans "the page you tried to visit is protected or you don't have sufficient points, see" %} <a href="/faq"> faq</a>；</li>
+            <li>{% trans "if you believe this error 404 should not have occured, please" %} 
+				<a href="{{feedback_site_url}}" target="_blank">{% trans "report this problem" %}</a></li>
             </u>
         </div>
         <script type="text/javascript">
             var GOOG_FIXURL_LANG = 'zh-cn';
-            var GOOG_FIXURL_SITE = 'http://cnprog.com/';
+            var GOOG_FIXURL_SITE = '{{site_url}}';
         </script>
         <script type="text/javascript" src="http://linkhelp.clients.google.com/tbproxy/lh/wm/fixurl.js"></script>
         <ul>
-            <li><a href="#" id="linkPrevious">返回前页 » </li>
-            <li><a href="/questions">查看最新问题 » </a></li>
-            <li><a href="/tags/">查看标签列表 » </a></li>
+            <li><a href="#" id="linkPrevious">{% trans "back to previous page" %} » </li>
+            <li><a href="/questions">{% trans "see all questions" %} » </a></li>
+            <li><a href="/tags/">{% trans "see all tags" %} » </a></li>
         </u>
     </div>
 
 </div>
 {% endblock %}
-
-
-
+<!-- end template 404.html -->
-- 
cgit v1.2.3-1-g7c22