went through about half of files to parametrize phrases containing words question, ask, answer

23 files changed, 89 insertions, 170 deletions

diff --git a/askbot/conf/words.py b/askbot/conf/words.py
index ec1f576e..0256dec3 100644
--- a/askbot/conf/words.py
+++ b/askbot/conf/words.py
@@ -104,6 +104,24 @@ settings.register(
 settings.register(
     values.StringValue(
         WORDS,
+        'WORDS_UNANSWERED_QUESTION_SINGULAR',
+        default=_('unanswered question'),
+        description=_('unanswered question (singular)'),
+    )
+)
+
+settings.register(
+    values.StringValue(
+        WORDS,
+        'WORDS_UNANSWERED_QUESTION_PLURAL',
+        default=_('unanswered questions'),
+        description=_('unanswered questions (plural)'),
+    )
+)
+
+settings.register(
+    values.StringValue(
+        WORDS,
         'WORDS_ANSWER_SINGULAR',
         default=_('answer'),
         description=_('answer (noun, sungular)'),
@@ -131,6 +149,18 @@ settings.register(
 settings.register(
     values.StringValue(
         WORDS,
+        'WORDS_THIS_QUESTION_HAS_BEEN_DELETED',
+        default=_(
+                'Sorry, this question has been '
+                'deleted and is no longer accessible'
+            ),
+        description=_('This question has been deleted')
+    )
+)
+
+settings.register(
+    values.StringValue(
+        WORDS,
         'WORDS_PLEASE_ENTER_YOUR_QUESTION',
         default=_('Please enter your question'),
         description=_('Please enter your question'),
@@ -194,6 +224,24 @@ settings.register(
 settings.register(
     values.StringValue(
         WORDS,
+        'WORDS_ONLY_ONE_ANSWER_PER_USER_IS_ALLOWED',
+        default=_('(only one answer per user is allowed)'),
+        description=_('Only one answer per user is allowed'),
+    )
+)
+
+settings.register(
+    values.StringValue(
+        WORDS,
+        'WORDS_ACCEPT_BEST_ANWERS_FOR_YOUR_QUESTIONS',
+        default=_('Accept the best answers for your questions'),
+        description=_('Accept the best answers for your questions')
+    )
+)
+
+settings.register(
+    values.StringValue(
+        WORDS,
         'WORDS_REPOST_AS_A_COMMENT_UNDER_THE_OLDER_ANSWER',
         default=_('repost as a comment under older answer'),
         description=_('repost as a comment under older answer'),
diff --git a/askbot/deps/django_authopenid/views.py b/askbot/deps/django_authopenid/views.py
index e60d410e..d8f8bd01 100644
--- a/askbot/deps/django_authopenid/views.py
+++ b/askbot/deps/django_authopenid/views.py
@@ -1352,16 +1352,3 @@ def account_recover(request):
             return show_signin_view(request, view_subtype = 'bad_key')
 
         return HttpResponseRedirect(get_next_url(request))
-
-#internal server view used as return value by other views
-def validation_email_sent(request):
-    """this function is called only if EMAIL_VALIDATION setting is
-    set to True bolean value"""
-    assert(askbot_settings.EMAIL_VALIDATION == True)
-    logging.debug('')
-    data = {
-        'email': request.user.email,
-        'change_email_url': reverse('user_changeemail'),
-        'action_type': 'validate'
-    }
-    return render(request, 'authopenid/changeemail.html', data)
diff --git a/askbot/forms.py b/askbot/forms.py
index 6e76fdb8..aa9d0839 100644
--- a/askbot/forms.py
+++ b/askbot/forms.py
@@ -471,11 +471,6 @@ class WikiField(forms.BooleanField):
             'community wiki (karma is not awarded & '
             'many others can edit wiki post)'
         )
-        self.help_text = _(
-            'if you choose community wiki option, the %(question)s '
-            'and answer do not generate points and name of '
-            'author will not be shown'
-        ) % {'question': askbot_settings.WORDS_QUESTION_SINGULAR or unicode(_('question'))}
 
     def clean(self, value):
         return value and askbot_settings.WIKI_ON
@@ -921,10 +916,6 @@ class AskForm(PostAsSomeoneForm, PostPrivatelyForm):
 
         self.fields['ask_anonymously'] = forms.BooleanField(
             label=_('post anonymously'),
-            help_text=_(
-                'Check if you do not want to reveal your name '
-                'when posting this %(question)s'
-            ) % {'question': askbot_settings.WORDS_QUESTION_SINGULAR},
             required=False,
         )
 
@@ -955,10 +946,6 @@ class AskWidgetForm(forms.Form, FormWithHideableFields):
     title = TitleField()
     ask_anonymously = forms.BooleanField(
         label=_('ask anonymously'),
-        help_text=_(
-            'Check if you do not want to reveal your name '
-            'when asking this question'
-        ),
         required=False,
     )
 
@@ -1209,11 +1196,6 @@ class EditQuestionForm(PostAsSomeoneForm, PostPrivatelyForm):
     summary = SummaryField()
     wiki = WikiField()
     reveal_identity = forms.BooleanField(
-        help_text=_(
-            'You have asked this question anonymously, '
-            'if you decide to reveal your identity, please check '
-            'this box.'
-        ),
         label=_('reveal identity'),
         required=False,
     )
diff --git a/askbot/mail/__init__.py b/askbot/mail/__init__.py
index abbbbb69..cb6f86a0 100644
--- a/askbot/mail/__init__.py
+++ b/askbot/mail/__init__.py
@@ -180,12 +180,12 @@ def mail_moderators(
     )
 
 
-INSTRUCTIONS_PREAMBLE = ugettext_lazy('<p>To ask by email, please:</p>')
+INSTRUCTIONS_PREAMBLE = ugettext_lazy('<p>To post by email, please:</p>')
 QUESTION_TITLE_INSTRUCTION = ugettext_lazy(
     '<li>Type title in the subject line</li>'
 )
 QUESTION_DETAILS_INSTRUCTION = ugettext_lazy(
-    '<li>Type details of your question into the email body</li>'
+    '<li>Type details into the email body</li>'
 )
 OPTIONAL_TAGS_INSTRUCTION = ugettext_lazy(
 """<li>The beginning of the subject line can contain tags,
@@ -211,7 +211,7 @@ def bounce_email(
     """
     if reason == 'problem_posting':
         error_message = _(
-            '<p>Sorry, there was an error posting your question '
+            '<p>Sorry, there was an error while processing your message '
             'please contact the %(site)s administrator</p>'
         ) % {'site': askbot_settings.APP_SHORT_NAME}
 
@@ -238,7 +238,7 @@ def bounce_email(
 
     elif reason == 'unknown_user':
         error_message = _(
-            '<p>Sorry, in order to post questions on %(site)s '
+            '<p>Sorry, in order to make posts to %(site)s '
             'by email, please <a href="%(url)s">register first</a></p>'
         ) % {
             'site': askbot_settings.APP_SHORT_NAME,
@@ -246,7 +246,7 @@ def bounce_email(
         }
     elif reason == 'permission_denied' and body_text is None:
         error_message = _(
-            '<p>Sorry, your question could not be posted '
+            '<p>Sorry, your post could not be made by email '
             'due to insufficient privileges of your user account</p>'
         )
     elif body_text:
diff --git a/askbot/management/commands/send_accept_answer_reminders.py b/askbot/management/commands/send_accept_answer_reminders.py
index 22ae311d..70baac62 100644
--- a/askbot/management/commands/send_accept_answer_reminders.py
+++ b/askbot/management/commands/send_accept_answer_reminders.py
@@ -57,15 +57,7 @@ class Command(NoArgsCommand):
             if question_count == 0:
                 continue
 
-            subject_line = _(
-                'Accept the best answer for %(question_count)d of your questions'
-            ) % {'question_count': question_count}
-
-            #todo - make a template for these
-            if question_count == 1:
-                reminder_phrase = _('Please accept the best answer for this question:')
-            else:
-                reminder_phrase = _('Please accept the best answer for these questions:')
+            reminder_phrase = _('Please select the best responses to:')
 
             data = {
                     'site_url': site_url(''),#here we need only the domain name
@@ -76,6 +68,7 @@ class Command(NoArgsCommand):
             template = get_template('email/accept_answer_reminder.html')
             body_text = template.render(Context(data))#todo: set lang
 
+            subject_line = askbot_settings.WORDS_ACCEPT_BEST_ANSWERS_FOR_YOUR_QUESTIONS
             if DEBUG_THIS_COMMAND:
                 print "User: %s<br>\nSubject:%s<br>\nText: %s<br>\n" % \
                     (user.email, subject_line, body_text)
diff --git a/askbot/management/commands/send_email_alerts.py b/askbot/management/commands/send_email_alerts.py
index e1783316..a9162079 100644
--- a/askbot/management/commands/send_email_alerts.py
+++ b/askbot/management/commands/send_email_alerts.py
@@ -433,8 +433,8 @@ class Command(NoArgsCommand):
                 question_count = len(q_list.keys())
 
                 subject_line = ungettext(
-                    '%(question_count)d updated question about %(topics)s',
-                    '%(question_count)d updated questions about %(topics)s',
+                    '%(question_count)d update about %(topics)s',
+                    '%(question_count)d updates about %(topics)s',
                     question_count
                 ) % {
                     'question_count': question_count,
diff --git a/askbot/management/commands/send_unanswered_question_reminders.py b/askbot/management/commands/send_unanswered_question_reminders.py
index 42ce5119..c428881d 100644
--- a/askbot/management/commands/send_unanswered_question_reminders.py
+++ b/askbot/management/commands/send_unanswered_question_reminders.py
@@ -64,11 +64,13 @@ class Command(NoArgsCommand):
             tag_summary = Thread.objects.get_tag_summary_from_threads(threads)
 
             subject_line = ungettext(
-                '%(question_count)d unanswered question about %(topics)s',
-                '%(question_count)d unanswered questions about %(topics)s',
+                '%(question_count)d %(unanswered_question)s about %(topics)s',
+                '%(question_count)d %(unanswered_questions)s about %(topics)s',
                 question_count
             ) % {
                 'question_count': question_count,
+                'unanswered_question': askbot_settings.WORDS_UNANSWERED_QUESTION_SINGULAR,
+                'unanswered_questions': askbot_settings.WORDS_UNANSWERED_QUESTION_PLURAL,
                 'topics': tag_summary
             }
 
diff --git a/askbot/models/post.py b/askbot/models/post.py
index 906cba1e..a90eaf3a 100644
--- a/askbot/models/post.py
+++ b/askbot/models/post.py
@@ -415,9 +415,9 @@ class Post(models.Model):
         """
         url = site_url(self.get_absolute_url(no_slug=True))
         if self.post_type == 'question':
-            tweet = _('Question: ')
+            tweet = askbot_settings.WORDS_QUESTION_SINGULAR + ': '
         elif self.post_type == 'answer':
-            tweet = _('Answer: ')
+            tweet = askbot_settings.WORDS_ANSWER_SINGULAR + ': '
 
         chars_left = 140 - (len(url) + len(tweet) + 1)
         title_str = self.thread.title[:chars_left]
@@ -1598,10 +1598,7 @@ class Post(models.Model):
         if self.is_approved() is False:
             raise exceptions.QuestionHidden()
         if self.deleted:
-            message = _(
-                'Sorry, this question has been '
-                'deleted and is no longer accessible'
-            )
+            message = _('Sorry, this content is no longer available')
             if user.is_anonymous():
                 raise exceptions.QuestionHidden(message)
             try:
@@ -1614,17 +1611,10 @@ class Post(models.Model):
         try:
             self.thread._question_post().assert_is_visible_to(user)
         except exceptions.QuestionHidden:
-            message = _(
-                'Sorry, the answer you are looking for is '
-                'no longer available, because the parent '
-                'question has been removed'
-            )
+            message = _('Sorry, this content is no longer available')
             raise exceptions.QuestionHidden(message)
         if self.deleted:
-            message = _(
-                'Sorry, this answer has been '
-                'removed and is no longer accessible'
-            )
+            message = _('Sorry, this content is no longer available')
             if user.is_anonymous():
                 raise exceptions.AnswerHidden(message)
             try:
@@ -1637,18 +1627,10 @@ class Post(models.Model):
         try:
             self.parent.assert_is_visible_to(user)
         except exceptions.QuestionHidden:
-            message = _(
-                        'Sorry, the comment you are looking for is no '
-                        'longer accessible, because the parent question '
-                        'has been removed'
-                       )
+            message = _('Sorry, this comment is no longer available')
             raise exceptions.QuestionHidden(message)
         except exceptions.AnswerHidden:
-            message = _(
-                        'Sorry, the comment you are looking for is no '
-                        'longer accessible, because the parent answer '
-                        'has been removed'
-                       )
+            message = _('Sorry, this comment is no longer available')
             raise exceptions.AnswerHidden(message)
 
     def assert_is_visible_to_user_groups(self, user):
diff --git a/askbot/models/question.py b/askbot/models/question.py
index 04d6a6e0..ceeba387 100644
--- a/askbot/models/question.py
+++ b/askbot/models/question.py
@@ -836,6 +836,7 @@ class Thread(models.Model):
 
         output = question.format_for_email_as_subthread()
         if answers:
+            #todo: words
             answer_heading = ungettext(
                                     '%(count)d answer:',
                                     '%(count)d answers:',
@@ -1598,9 +1599,3 @@ class AnonymousQuestion(DraftContent):
                             text=self.text,
                             tagnames=self.tagnames
                         )
-            #add message with a link to the ask page
-            extra_message = _(
-                'Please, <a href="%s">review your question</a>.'
-            ) % reverse('ask')
-            message = string_concat(unicode(error), u' ', extra_message)
-            user.message_set.create(message=unicode(message))
diff --git a/askbot/models/repute.py b/askbot/models/repute.py
index 5e9c295f..7b2109a7 100644
--- a/askbot/models/repute.py
+++ b/askbot/models/repute.py
@@ -213,21 +213,10 @@ class Repute(models.Model):
                                 'username': self.user.username,
                                 'question_title': self.question.thread.title
                             }
-            if delta > 0:
-                link_title = _(
-                                '%(points)s points were added for %(username)s\'s '
-                                'contribution to question %(question_title)s'
-                            ) % link_title_data
-            else:
-                link_title = _(
-                                '%(points)s points were subtracted for %(username)s\'s '
-                                'contribution to question %(question_title)s'
-                            ) % link_title_data
 
-            return '<a href="%(url)s" title="%(link_title)s">%(question_title)s</a>' \
+            return '<a href="%(url)s">%(question_title)s</a>' \
                             % {
                                'url': self.question.get_absolute_url(),
                                'question_title': escape(self.question.thread.title),
-                               'link_title': escape(link_title)
                             }
 
diff --git a/askbot/models/user.py b/askbot/models/user.py
index ad49222b..60c95bc8 100644
--- a/askbot/models/user.py
+++ b/askbot/models/user.py
@@ -312,6 +312,7 @@ class EmailFeedSetting(models.Model):
         'q_sel': 'i',
         'm_and_c': 'i'
     }
+    #todo: words
     FEED_TYPE_CHOICES = (
                     ('q_all', ugettext_lazy('Entire forum')),
                     ('q_ask', ugettext_lazy('Questions that I asked')),
diff --git a/askbot/templates/ask.html b/askbot/templates/ask.html
index 66c4d54d..080fa2f4 100644
--- a/askbot/templates/ask.html
+++ b/askbot/templates/ask.html
@@ -18,11 +18,11 @@
         {% else %}
             <ul>
                 {% if not request.user.is_authenticated() %}
-                <li class="warning">{% trans %}since you are not logged in right now, you will be asked to sign in or register after posting your question{% endtrans %}</li>
+                <li class="warning">{% trans %}since you are not logged in right now, you will be asked to sign in or register after making your post{% endtrans %}</li>
                 {% else %}
                     {% if settings.EMAIL_VALIDATION %}
                         {% if not request.user.email_isvalid %}
-                        <li class="warning">{% trans email=request.user.email %}Your email, {{ email }} has not yet been validated. To post messages you must verify your email, please see <a href='{{ email_validation_faq_url }}'>more details here</a>. You can submit your question now and validate email after that. Meanwhile, your question will saved as pending.{% endtrans %}</li>
+                        <li class="warning">{% trans email=request.user.email %}Your email, {{ email }} has not yet been validated. To post messages you must verify your email, please see <a href='{{ email_validation_faq_url }}'>more details here</a>. You can submit your post now and validate email after that.{% endtrans %}</li>
                         {% endif %}
                     {% endif %}
                 {% endif %}
@@ -31,11 +31,6 @@
                 <li>{% trans %}be clear and concise{% endtrans %}</li>
             </ul>
         {% endif %}
-        <p class='info-box-follow-up-links'>
-    <!-- will be change to a popup windows
-            <a href="{% url faq %}" target="_blank" title="{% trans %}see frequently asked questions{% endtrans %}">{% trans %}FAQ{% endtrans %} »</a>
-    -->
-        </p>
     </div>
     {% include "widgets/ask_form.html" %}
 {% endblock %}
diff --git a/askbot/templates/authopenid/changeemail.html b/askbot/templates/authopenid/changeemail.html
deleted file mode 100644
index 37de8369..00000000
--- a/askbot/templates/authopenid/changeemail.html
+++ /dev/null
@@ -1,29 +0,0 @@
-{% extends "one_column_body.html" %}
-{% block title %}{% spaceless %}{% trans %}Change Email{% endtrans %}{% endspaceless %}{% endblock %}
-{% block content %}
-{% if action_type=="validate" %}
-    <div id="main-bar" class="headNormal">
-        {% trans %}Validate email{% endtrans %}
-    </div>
-    <p class="message">
-        {% trans %}<span class=\"strong big\">An email with a validation link has been sent to 
-{{ email }}.</span> Please <strong>follow the emailed link</strong> with your 
-web browser. Email validation is necessary to help insure the proper use of 
-email on <span class=\"orange\">Q&amp;A</span>. If you would like to use 
-<strong>another email</strong>, please <a 
-href='{{ change_email_url }}'><strong>change it again</strong></a>.{% endtrans %}
-    </p>
-{% elif action_type=="validation_complete" %}
-    <div id="main-bar" class="headNormal">
-        {% trans %}Email verified{% endtrans %}
-    </div>
-    <p class="message">
-        {% trans %}<span class=\"big strong\">Thank you for verifying your email!</span> Now 
-you can <strong>ask</strong> and <strong>answer</strong> questions. Also if 
-you find a very interesting question you can <strong>subscribe for the 
-updates</strong> - then will be notified about changes <strong>once a day</strong>
-or less frequently.{% endtrans %}
-    </p>
-{% endif %}
-{% endblock %}
-<!-- end changeemail.html -->
diff --git a/askbot/templates/authopenid/signin.html b/askbot/templates/authopenid/signin.html
index ad003b69..073032d2 100644
--- a/askbot/templates/authopenid/signin.html
+++ b/askbot/templates/authopenid/signin.html
@@ -10,20 +10,7 @@
 {% if have_buttons or view_subtype == 'email_sent' %}

     <h1 class="section-title">{{page_title}}</h1>

 {% endif %}

-    {% if answer %}

-        <div class="message">

-        {% trans title=answer.question.title|escape %}

-        Your answer to {{title}} will be posted once you log in

-        {% endtrans %}

-        </div>

-    {% endif %}

-    {% if question %}

-        <div class="message">

-        {% trans title=question.title|escape %}Your question 

-        {{title}} will be posted once you log in

-        {% endtrans %}

-        </div>

-    {% endif %}

+    <div class="message">{% trans %}Please log in or register to finish posting{% endtrans %}</div>

     {% if not (view_subtype == 'default' and have_buttons) %}

     <p id='login-intro'>

         {% if view_subtype == 'add_openid' and have_buttons %}

diff --git a/askbot/templates/authopenid/widget_signin.html b/askbot/templates/authopenid/widget_signin.html
index 717aec63..8190158a 100644
--- a/askbot/templates/authopenid/widget_signin.html
+++ b/askbot/templates/authopenid/widget_signin.html
@@ -14,20 +14,7 @@
 {% if have_buttons or view_subtype == 'email_sent' %}

     <h1 class="section-title">{{page_title}}</h1>

 {% endif %}

-    {% if answer %}

-        <div class="message">

-        {% trans title=answer.question.title|escape %}

-        Your answer to {{title}} will be posted once you log in

-        {% endtrans %}

-        </div>

-    {% endif %}

-    {% if question %}

-        <div class="message">

-        {% trans title=question.title|escape %}Your question 

-        {{title}} will be posted once you log in

-        {% endtrans %}

-        </div>

-    {% endif %}

+    <div class="message">{% trans %}Please log in or register to finish posting{% endtrans %}</div>

     <p id='login-intro'>

     {% if view_subtype == 'default' and have_buttons %}

         {% trans %}Choose your favorite service below to sign in using secure OpenID or similar technology. Your external service password always stays confidential and you don't have to rememeber or create another one.{% endtrans %}

diff --git a/askbot/templates/email/delayed_email_alert.html b/askbot/templates/email/delayed_email_alert.html
index 3ccacea4..252a2337 100644
--- a/askbot/templates/email/delayed_email_alert.html
+++ b/askbot/templates/email/delayed_email_alert.html
@@ -1,6 +1,6 @@
 {% block content %}
 <p>{% trans %}Dear {{ name }},{% endtrans %}</p>
-<p>{% trans num=questions|length %}The following question has been updated {{ site_name }}:{% pluralize num %}The following {{ num }} questions have been updated on {{ site_name }}:{% endtrans %}</p>
+<p>{% trans %}{{ site_name }} has these updates, please have a look:{% endtrans %}</p>
 <ul>
 {% for q in questions %}
     <li>
diff --git a/askbot/templates/email/macros.html b/askbot/templates/email/macros.html
index 04b4bf73..3b190e9f 100644
--- a/askbot/templates/email/macros.html
+++ b/askbot/templates/email/macros.html
@@ -16,10 +16,10 @@
             {% endif %}
                     {% if format == 'parent_subthread' %}
                         {% if is_leaf_post %}
-                            {% trans %}Question by {{ author }}:{% endtrans %}
+                            {% trans %}Started by {{ author }}:{% endtrans %}
                         {% else %}
                             {% trans -%}
-                                In reply to {{ author }}'s question:
+                                In reply to {{ author }}:
                             {%- endtrans %}
                         {% endif %}
                     {% else %}
@@ -30,7 +30,7 @@
             {% if quote_level > 0 %}
             <p style="font-size:10px; font-weight: bold;">
                     {% if format != 'parent_subthread' %}
-                        {% trans %}Asked by {{ author }}:{% endtrans %}
+                        {% trans %}Started by {{ author }}:{% endtrans %}
                     {% endif %}
             </p>
             {% endif %}
@@ -46,15 +46,15 @@
                     {% if format == 'parent_subthread' %}
                         {% if is_leaf_post %}
                             {% trans -%}
-                                {{ author }}'s answer:
+                                {{ author }}'s response:
                             {%- endtrans %}
                         {% else %}
                             {% trans -%}
-                                In reply to {{ author }}'s answer:
+                                In reply to {{ author }}:
                             {%- endtrans %}
                         {% endif %}
                     {% else %}
-                        {% trans %}Answered by {{ author }}:{% endtrans %}
+                        {% trans %}Replied by {{ author }}:{% endtrans %}
                     {% endif %}
                 </p>
             {% else %}
diff --git a/askbot/templates/list_suggested_tags.html b/askbot/templates/list_suggested_tags.html
index 1c9a947d..7c69ddc3 100644
--- a/askbot/templates/list_suggested_tags.html
+++ b/askbot/templates/list_suggested_tags.html
@@ -11,7 +11,7 @@
                     <th class="tags-col">{% trans %}Tag{% endtrans %}</th>
                     <th class="users-col">{% trans %}Suggested by{% endtrans %}</th>
                     <th class="decision-col">{% trans %}Your decision{% endtrans %}</th>
-                    <th>{% trans %}Suggested tag was used for questions{% endtrans %}</th>
+                    <th>{% trans %}Where the tag was used{% endtrans %}</th>
                 </tr>
             </thead>
             <tbody>
@@ -35,7 +35,7 @@
                                     <button class="reject">{% trans %}Reject{% endtrans %}</button>
                                 </td>
                                 <td class="thread-links-col">
-                                    <span>{% trans %}There are no questions with this tag yet{% endtrans %}</span>
+                                    <span>{% trans %}This tag has not yet been used{% endtrans %}</span>
                                 </td>
                             </tr>
                         {% else %}
@@ -58,7 +58,7 @@
                 <tr class="per-tag-controls" data-tag-id="{{ tag.id }}">
                     <td colspan="4">
                         {% if tag.threads.count() > 1 %}
-                            <button class="accept">{% trans name=tag.name %}Apply tag "{{ name }}" to all above questions{% endtrans %}</button>
+                            <button class="accept">{% trans name=tag.name %}Apply tag "{{ name }}" to the above{% endtrans %}</button>
                             <button class="reject">{% trans %}Reject tag{% endtrans %}</button>
                         {% endif %}
                     </td>
diff --git a/askbot/templates/macros.html b/askbot/templates/macros.html
index f37a47e1..63ed93b3 100644
--- a/askbot/templates/macros.html
+++ b/askbot/templates/macros.html
@@ -311,7 +311,6 @@ poor design of the data or methods on data objects #}
             class="tag tag-right{% if css_class %} {{ css_class }}{% endif %}"
             {% if is_link %}
             href="{{ search_state.add_tag(tag).full_url() }}"
-            title="{% trans tag=tag|escape %}see questions tagged '{{ tag }}'{% endtrans %}"
             {% endif %}
             rel="tag"
             data-tag-name="{{ tag|replace('*', '&#10045;')|escape }}"
diff --git a/askbot/templates/question/closed_question_info.html b/askbot/templates/question/closed_question_info.html
index e9a915be..57666426 100644
--- a/askbot/templates/question/closed_question_info.html
+++ b/askbot/templates/question/closed_question_info.html
@@ -2,7 +2,7 @@
     <h3>{% trans %}Closed for the following reason{% endtrans %}
       <b>{{ thread.get_close_reason_display() }}</b> {% trans %}by{% endtrans %}
       {% else %}
-      {% trans close_reason=thread.get_close_reason_display() %}The question has been closed for the following reason <b>"{{ close_reason }}"</b> <i>by{% endtrans %}
+      {% trans close_reason=thread.get_close_reason_display() %}Closed for the following reason <b>"{{ close_reason }}"</b> <i>by{% endtrans %}
       {% endif %}
       <a href="{{ thread.closed_by.get_profile_url() }}">{{ thread.closed_by.username|escape }}</a> </i><br>
       {% trans closed_at=thread.closed_at %}close date {{closed_at}}{% endtrans %}</h3>
diff --git a/askbot/templates/question/content.html b/askbot/templates/question/content.html
index ea9031ce..50bfee55 100644
--- a/askbot/templates/question/content.html
+++ b/askbot/templates/question/content.html
@@ -36,7 +36,7 @@
             class="button submit"
             href="{% url "edit_answer" previous_answer.id %}"
         >{{ settings.WORDS_EDIT_YOUR_PREVIOUS_ANSWER|escape }}</a>
-        <span>{% trans %}(only one answer per user is allowed){% endtrans %}</span>
+        <span>{{ settings.WORDS_ONLY_ONE_ANSWER_PER_USER_IS_ALLOWED|escape }}</span>
         <div class="invisible">
             {# hidden because we still need js from the tinymce widget #}
             {% include "question/new_answer_form.html" %}
diff --git a/askbot/templates/reopen.html b/askbot/templates/reopen.html
index 5096d6f4..9c617403 100644
--- a/askbot/templates/reopen.html
+++ b/askbot/templates/reopen.html
@@ -9,7 +9,7 @@
         <span class="big">{{ question.get_question_title()|escape }}</span>
     </a>
 </p>
-<p>{% trans username = closed_by_username|escape %}This question has been closed by 
+<p>{% trans username = closed_by_username|escape %}Closed by: 
     <a href="{{closed_by_profile_url}}">{{username}}</a>
 {% endtrans %}
 </p>
diff --git a/askbot/views/readers.py b/askbot/views/readers.py
index 8bf2cea9..50bb7a0d 100644
--- a/askbot/views/readers.py
+++ b/askbot/views/readers.py
@@ -154,6 +154,7 @@ def questions(request, **kwargs):
     if request.is_ajax():
         q_count = paginator.count
 
+        #todo: words
         question_counter = ungettext('%(q_num)s question', '%(q_num)s questions', q_count)
         question_counter = question_counter % {'q_num': humanize.intcomma(q_count),}