Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG

 * Merge of Spanish translation, still missing some texts.
 * Custom colors for preguntalo project

Conflicts:
	locale/es/LC_MESSAGES/django.mo
	locale/es/LC_MESSAGES/django.po
	templates/content/style/style.css

1 files changed, 58 insertions, 30 deletions

diff --git a/templates/questions.html b/templates/questions.html
index bfc1177c..5dac0156 100644
--- a/templates/questions.html
+++ b/templates/questions.html
@@ -1,9 +1,10 @@
 {% extends "base.html" %}
-{% load i18n %}
+<!-- questions.html -->
 {% load extra_tags %}
+{% load i18n %}
 {% load humanize %}
 {% load extra_filters %}
-{% block title %}{% spaceless %}{% trans "Question list" %}{% endspaceless %}{% endblock %}
+{% block title %}{% spaceless %}{% trans "Questions" %}{% endspaceless %}{% endblock %}
 {% block forejs %}
        <script type="text/javascript">
         $().ready(function(){
@@ -19,12 +20,12 @@
 {% endblock %}
 {% block content %}
 <div class="tabBar">
-    <div class="headQuestions">{% if searchtag %}{% trans "Tagged questions" %}{% else %}{% if searchtitle %}{% trans "Query result" %}{% else %}{% trans "All questions" %}{% endif %}{% endif %}</div>
+    <div class="headQuestions">{% if searchtag %}{% trans "Found by tags" %}{% else %}{% if searchtitle %}{% trans "Found by title" %}{% else %}{% trans "All questions" %}{% endif %}{% endif %}</div>
     <div class="tabsA">
-        <a id="latest" href="?sort=latest" class="off" title="{% trans 'New questions' %}">{% trans "Newest" %}</a>
-        <a id="active" href="?sort=active" class="off" title="{% trans 'Newest updated questions' %}">{% trans "Active" %}</a>
-        <a id="hottest" href="?sort=hottest" class="off" title="{% trans 'Questions with most answers' %}">{% trans "Hottest" %}</a>
-        <a id="mostvoted" href="?sort=mostvoted" class="off" title="{% trans 'Questions with most votes' %}">{% trans "Best" %}</a>    
+        <a id="latest" href="?sort=latest" class="off" title="{% trans "most recently asked questions" %}">{% trans "newest" %}</a>
+        <a id="active" href="?sort=active" class="off" title="{% trans "most recently updated questions" %}">{% trans "active" %}</a>
+        <a id="hottest" href="?sort=hottest" class="off" title="{% trans "hottest questions" %}">{% trans "hottest" %}</a>
+        <a id="mostvoted" href="?sort=mostvoted" class="off" title="{% trans "most voted questions" %}">{% trans "most voted" %}</a>    
     </div>
 </div>
 <div id="listA">
@@ -41,9 +42,9 @@
                     <td><span class="num">{{ question.view_count|cnprog_intword|safe }}</span> </td>
 	            </tr>  
                 <tr>
-                    <td><span class="unit">{% trans "Answers" %}</span></td>
-                    <td><span class="unit">{% trans "Votes" %}</span></td>
-                    <td><span class="unit">{% trans "Visits" %}</span></td>
+                    <td><span class="unit">{% trans "answers" %}</span></td>
+                    <td><span class="unit">{% trans "votes" %}</span></td>
+                    <td><span class="unit">{% trans "views" %}</span></td>
 	            </tr> 
             </table>
         </div>
@@ -54,7 +55,7 @@
         
         {% ifequal tab_id 'active'%}
         {% if question.wiki %}
-        <span class="from wiki">{% trans "Community wiki" %}</span>
+        <span class="from wiki">{% trans "community wiki" %}</span>
         <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
         {% else %}
         <div class="from">
@@ -66,7 +67,7 @@
         {% endif %}
         {% else %}
         {% if question.wiki %}
-        <span class="from wiki">{% trans "Community wiki" %}</span>
+        <span class="from wiki">{% trans "community wiki" %}</span>
         <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
         {% else %}
         <div class="from">
@@ -80,7 +81,7 @@
         
         <div class="tags">
         {% for tag in question.tagname_list %}
-        <a href="{% url forum.views.tag tag|urlencode %}" title="{% trans 'Browse questions with tag of '%}" rel="tag">{{ tag }}</a>
+        <a href="{% url forum.views.tag tag|urlencode %}" title="{% trans "see questions tagged" %}'{{ tag }}'{% trans "using tags" %}" rel="tag">{{ tag }}</a>
         {% endfor %}
         </div>
     </div>
@@ -104,28 +105,55 @@
 {% block sidebar %}
 <div class="boxC">
     <p>
-        您正在浏览所有<br><div class="questions-count">{{ questions_count|intcomma }}</div>
-        <p>个
-            {% if searchtag %}
-                标记为
-                <span class="tag">
-                    {{ searchtag }} 
-                </span>
-            {% endif %}
-            {% if searchtitle %}
-                标题含有
-                <strong class="darkred">
-                    {{ searchtitle }}
-                </strong>
-            {% endif %}
-         的问题。</p>
+		{% if searchtag %}
+			{% blocktrans count questions_count as cnt with questions_count|intcomma as q_num and searchtag as tagname %}
+			have total {{q_num}} questions tagged {{tagname}}
+			{% plural %}
+			have total {{q_num}} questions tagged {{tagname}}
+			{% endblocktrans %}
+		{% else %}
+			{% if searchtitle %}
+				{% blocktrans count questions_count as cnt with questions_count|intcomma as q_num %}
+				have total {{q_num}} questions containing {{searchtitle}}
+				{% plural %}
+				have total {{q_num}} questions containing {{searchtitle}}
+				{% endblocktrans %}
+			{% else %}
+				{% blocktrans count questions as cnt with questions_count|intcomma as q_num %}
+				have total {{q_num}} questions
+				{% plural %}
+				have total {{q_num}} questions
+				{% endblocktrans %}
+			{% endif %}
+		{% endif %}
+
+        {% ifequal tab_id "latest" %}
+			<p>{% trans "latest questions info" %}</p>
+        {% endifequal %}
+        
+        {% ifequal tab_id "active" %}
+            <p>{% trans "Questions are sorted by the <strong>time of last update</strong>." %} 
+			{% trans "Most recently answered ones are shown first." %}</p>
+        {% endifequal %}
+        
+        {% ifequal tab_id "hottest" %}
+			<p>{% trans "Questions sorted by <strong>number of responses</strong>." %}
+            {% trans "Most answered questions are shown first." %}</p>
+        {% endifequal %}
+        
+        {% ifequal tab_id "mostvoted" %}
+			<p>{% trans "Questions are sorted by the <strong>number of votes</strong>." %}
+            {% trans "Most voted questions are shown first." %}</p>
+        {% endifequal %}
+        
+        
     </p>
 </div>
 <div class="boxC">
 	<h3 class="subtitle">{% trans "Related tags" %}</h3>
     <div class="tags">
         {% for tag in tags %}
-            <a rel="tag" href="{% url forum.views.tag tag.name|urlencode %}">{{ tag.name }}</a>
+            <a rel="tag" title="{% trans "see questions tagged" %}'{{ tag.name }}'{% trans "using tags" %}"  href="{% url forum.views.tag tag.name|urlencode %}">{{ tag.name }}</a>
             <span class="tag-number">× {{ tag.used_count|intcomma }}</span>
             <br>
         {% endfor %}
@@ -134,4 +162,4 @@
 </div>
 
 {% endblock %}
-
+<!-- end questions.html -->