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

---
 templates/badge.html | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'templates/badge.html')

diff --git a/templates/badge.html b/templates/badge.html
index 4ffedfa6..d0906918 100644
--- a/templates/badge.html
+++ b/templates/badge.html
@@ -1,7 +1,9 @@
+<!-- template badge.html -->
 {% extends "base_content.html" %}
+{% load i18n %}
 {% load extra_tags %}
 {% load humanize %}
-{% block title %}{% spaceless %}{{ badge.name }}-奖牌{% endspaceless %}{% endblock %}
+{% block title %}{% spaceless %}{{ badge.name }} - {% trans "Badge" %}{% endspaceless %}{% endblock %}
 {% block forejs %}
        <script type="text/javascript">
         $().ready(function(){
@@ -12,7 +14,7 @@
 {% endblock %}
 {% block content %}
 <div id="main-bar" class="headNormal">
-    奖牌
+	{% trans "Badge" %}
 </div>
 <div id="main-body" style="width:100%;margin-bottom:20px">
     <p>
@@ -21,7 +23,7 @@
     <div>
         {% if badge.awarded_count %}
         <p style="float:left"><span class="count">{{ awards|length|intcomma }}</span>
-        <strong>用户已被授予该奖牌：</strong></p>
+        <strong>{% trans "The users have been awarded with badges:" %}</strong></p>
         {% endif %}
     </div>
     <div id="award-list" style="clear:both;margin-left:20px;line-height:25px;">
@@ -32,7 +34,4 @@
 
 </div>
 {% endblock %}
-
-
-
-
+<!-- end template badge.html -->
-- 
cgit v1.2.3-1-g7c22