summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--askbot/locale/en/LC_MESSAGES/django.mobin21718 -> 21719 bytes
-rw-r--r--askbot/locale/en/LC_MESSAGES/django.po2
-rw-r--r--askbot/skins/default/templates/question.html2
-rw-r--r--askbot/skins/default/templates/user_profile/user_reputation.html10
4 files changed, 7 insertions, 7 deletions
diff --git a/askbot/locale/en/LC_MESSAGES/django.mo b/askbot/locale/en/LC_MESSAGES/django.mo
index c76592aa..0a3a6365 100644
--- a/askbot/locale/en/LC_MESSAGES/django.mo
+++ b/askbot/locale/en/LC_MESSAGES/django.mo
Binary files differ
diff --git a/askbot/locale/en/LC_MESSAGES/django.po b/askbot/locale/en/LC_MESSAGES/django.po
index 1de218f7..2eb55bf2 100644
--- a/askbot/locale/en/LC_MESSAGES/django.po
+++ b/askbot/locale/en/LC_MESSAGES/django.po
@@ -3256,7 +3256,7 @@ msgid ""
"As a registered user you can login with your OpenID, log out of the site or "
"permanently remove your account."
msgstr ""
-"Clicking <strong>Logout</strong> will log you out from the forumbut will not "
+"Clicking <strong>Logout</strong> will log you out from the forum but will not "
"sign you off from your OpenID provider.</p><p>If you wish to sign off "
"completely - please make sure to log out from your OpenID provider as well."
diff --git a/askbot/skins/default/templates/question.html b/askbot/skins/default/templates/question.html
index 87209147..0c48d1f4 100644
--- a/askbot/skins/default/templates/question.html
+++ b/askbot/skins/default/templates/question.html
@@ -299,7 +299,7 @@
{% endfor %}
<div class="paginator-container-left">
{{ macros.paginator(paginator_context) }}
- </div>
+ </div><br/>
{% endif %}
<form id="fmanswer" action="{% url answer question.id %}" method="post">
{% if request.user.is_authenticated() %}
diff --git a/askbot/skins/default/templates/user_profile/user_reputation.html b/askbot/skins/default/templates/user_profile/user_reputation.html
index 25a67cc1..99b304d2 100644
--- a/askbot/skins/default/templates/user_profile/user_reputation.html
+++ b/askbot/skins/default/templates/user_profile/user_reputation.html
@@ -6,12 +6,12 @@
{% block usercontent %}
<div class="karma-summary">
<div id="diagram" class="karma-diagram"></div>
- {% if view_user.id == user.id %}
- <h3>{% trans %}Your karma change log.{% endtrans %}</h3>
- {% else %}
- <h3>{% trans user_name=view_user.username %}{{user_name}}'s karma change log{% endtrans %}</h3>
- {% endif %}
<div class="karma-details">
+ {% if view_user.id == user.id %}
+ <h3>{% trans %}Your karma change log.{% endtrans %}</h3>
+ {% else %}
+ <h3>{% trans user_name=view_user.username %}{{user_name}}'s karma change log{% endtrans %}</h3>
+ {% endif %}
{% for rep in reputation %}
<p>
<span class="karma-gained">{{ rep.positive }}</span>