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/users_questions.html | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'templates/users_questions.html')

diff --git a/templates/users_questions.html b/templates/users_questions.html
index f797a6b8..dfb87c8f 100644
--- a/templates/users_questions.html
+++ b/templates/users_questions.html
@@ -1,17 +1,21 @@
+<!-- users_questions.html -->
 {% load extra_tags %}
 {% load extra_filters %}
 {% load humanize %}
+{% load i18n %}
 <div class="user-stats-table">
     {% for question in questions%}
         {% if question.favourite_count %}
             {% if question.favorited_myself %}
                 <div class="favorites-count">
-                    <img title="这个问题被 {{question.favourite_count}} 位用户收藏" src="/content/images/vote-favorite-on.png">
+                    <img title="{% trans "this questions was selected as favorite" %} {{question.favourite_count}} {% trans "number of times" %}" 
+						src="/content/images/vote-favorite-on.png">
                     <div><b>{{question.favourite_count|intcomma}}</b></div>
                 </div>
             {% else %}
                 <div class="favorites-count-off">
-                    <img title="这个问题被 {{question.favourite_count}} 位用户收藏" src="/content/images/vote-favorite-off.png">
+                    <img title="{% trans "this question was selected as favorite" %}{{question.favourite_count}} {% trans "number of times" %}" 
+						src="/content/images/vote-favorite-off.png">
                     <div><b>{{question.favourite_count|intcomma}}</b></div>
                 </div>
             {% endif %}
@@ -23,17 +27,17 @@
             <div class="stats">
                 <div class="votes">
                     <div class="vote-count-post">{{question.vote_count|intcomma}}</div> 
-                    票
+                    {% trans "votes" %}
                   
                 </div>
-                <div title="{% if question.answer_accepted %}有答案已被接受为正确答案{% endif %}" class="status {% if question.answer_accepted %}answered-accepted{% endif %} {% ifequal question.answer_count 0 %}unanswered{% endifequal %}{% ifnotequal question.answer_count 0 %}answered{% endifnotequal %}">
+                <div title="{% if question.answer_accepted %}{% trans "this answer has been accepted to be correct" %}{% endif %}" class="status {% if question.answer_accepted %}answered-accepted{% endif %} {% ifequal question.answer_count 0 %}unanswered{% endifequal %}{% ifnotequal question.answer_count 0 %}answered{% endifnotequal %}">
                     <div class="answer-count-post">{{question.answer_count|intcomma}}</div>
-                    回答
+                    {% trans "answers" %}
              
                 </div>
                 <div class="views">
                      <div class="views-count-post">{{question.view_count|cnprog_intword|safe}}</div>
-                     浏览
+					 {% trans "views" %}
                 </div>
             </div>
         </a>
@@ -44,7 +48,8 @@
             <div class="tags">
                 {% convert2tagname_list question %}
                 {% for tag in question.tagnames %}
-                    <a href="{% url forum.views.tag tag|urlencode %}" title="查看有关'{{ tag }}'的问题" rel="tag">{{ tag }}</a>
+					<!--todo - move trans below to blocktrans -->
+                    <a href="{% url forum.views.tag tag|urlencode %}" title="{% trans "see questions tagged" %} '{{ tag }}' {% trans "using tags" %}" rel="tag">{{ tag }}</a>
                 {% endfor %}
             </div>
             <div class="started">
@@ -57,4 +62,5 @@
     </div>
     <br clear="both"/>
     {% endfor %}
-</div>
\ No newline at end of file
+</div>
+<!-- end users_questions.html -->
-- 
cgit v1.2.3-1-g7c22