From dcda943830ce044d3adeb0c801dd9f06a0feb6ea Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Wed, 12 Aug 2009 15:26:56 -0400
Subject: merged Bruno url translations, removed his local mods, added
 settings.BOOKS_ON, validated more templates

---
 context.py                                  |   1 +
 django_authopenid/views.py                  |   2 +
 forum/models.py                             |  10 +-
 forum/views.py                              |   2 +-
 locale/en/LC_MESSAGES/django.mo             | Bin 13992 -> 14334 bytes
 locale/en/LC_MESSAGES/django.po             | 606 +++++++++++++++++-----------
 locale/es/LC_MESSAGES/django.mo             | Bin 0 -> 49713 bytes
 locale/es/LC_MESSAGES/django.po             | 281 +++++++------
 settings_local.py.dist                      |   2 +-
 templates/404.html                          |   8 +-
 templates/about.html                        |  11 +-
 templates/content/images/logo.png           | Bin 4972 -> 3631 bytes
 templates/content/images/originals/logo.svg | 119 ------
 templates/content/style/style.css           |  13 +-
 templates/faq.html                          |   4 +-
 templates/header.html                       |  13 +-
 templates/index.html                        |   8 +-
 templates/question.html                     |   2 +-
 templates/user_stats.html                   |  84 +---
 templates/user_tabs.html                    |   2 +-
 templates/users_questions.html              |  30 +-
 21 files changed, 580 insertions(+), 618 deletions(-)
 create mode 100644 locale/es/LC_MESSAGES/django.mo
 delete mode 100644 templates/content/images/originals/logo.svg

diff --git a/context.py b/context.py
index c068332c..3da69f7b 100644
--- a/context.py
+++ b/context.py
@@ -10,6 +10,7 @@ def application_settings(context):
         'LANGUAGE_CODE': settings.LANGUAGE_CODE,
         'GOOGLE_SITEMAP_CODE':settings.GOOGLE_SITEMAP_CODE,
         'GOOGLE_ANALYTICS_KEY':settings.GOOGLE_ANALYTICS_KEY,
+        'BOOKS_ON':settings.BOOKS_ON,
         }
     return {'settings':my_settings}
 
diff --git a/django_authopenid/views.py b/django_authopenid/views.py
index 218a31a2..d055396b 100644
--- a/django_authopenid/views.py
+++ b/django_authopenid/views.py
@@ -555,6 +555,8 @@ def send_new_email_key(user,nomessage=False):
     import random
     random.seed()
     user.email_key = '%032x' % random.getrandbits(128) 
+    print len(user.email_key)
+    print user.email_key
     user.save()
     _send_email_key(user)
     if nomessage==False:
diff --git a/forum/models.py b/forum/models.py
index 9060b436..f647ba12 100644
--- a/forum/models.py
+++ b/forum/models.py
@@ -183,7 +183,7 @@ class Question(models.Model):
         return u','.join([unicode(tag) for tag in self.tagname_list()])
 
     def get_absolute_url(self):
-        return '%s%s' % (reverse('question', args=[self.id]), self.title.replace(' ', '-'))
+        return '%s%s' % (reverse('question', args=[self.id]), slugify(self.title))
 
     def has_favorite_by_user(self, user):
         if not user.is_authenticated():
@@ -303,7 +303,7 @@ class QuestionRevision(models.Model):
         return self.question.title
 
     def get_absolute_url(self):
-        return '/questions/%s/revisions' % (self.question.id)
+        return '/%s%s/%s' % (_('questions/'),self.question.id,_('revisions'))
 
     def save(self, **kwargs):
         """Looks up the next available revision number."""
@@ -415,7 +415,7 @@ class AnswerRevision(models.Model):
     text       = models.TextField()
 
     def get_absolute_url(self):
-        return '/answers/%s/revisions' % (self.answer.id)
+        return '/%s%s/%s' % (_('answers/'),self.answer.id,_('revisions'))
 
     def get_question_title(self):
         return self.answer.question.title
@@ -587,7 +587,7 @@ QUESTIONS_PER_PAGE_CHOICES = (
 )
 
 User.add_to_class('email_isvalid', models.BooleanField(default=False))
-User.add_to_class('email_key', models.CharField(max_length=16, null=True))
+User.add_to_class('email_key', models.CharField(max_length=32, null=True))
 User.add_to_class('reputation', models.PositiveIntegerField(default=1))
 User.add_to_class('gravatar', models.CharField(max_length=32))
 User.add_to_class('email_feeds', generic.GenericRelation(EmailFeed))
@@ -629,7 +629,7 @@ def delete_messages(self):
 
 def get_profile_url(self):
     """Returns the URL for this User's profile."""
-    return '%s%s/' % (reverse('user', args=[self.id]), self.username)
+    return '%s%s/' % (reverse('user', args=[self.id]), slugify(self.username))
 User.add_to_class('get_profile_url', get_profile_url)
 User.add_to_class('get_messages', get_messages)
 User.add_to_class('delete_messages', delete_messages)
diff --git a/forum/views.py b/forum/views.py
index 626c93a3..89d0cbfd 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -332,7 +332,7 @@ def question(request, id):
     answers = answers.select_related(depth=1)
 
     favorited = question.has_favorite_by_user(request.user)
-    if not request.user.is_anonymous():
+    if request.user.is_authenticated():
         question_vote = question.votes.select_related().filter(user=request.user)
     else:
         question_vote = None #is this correct?
diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index 11d15deb..447afac4 100644
Binary files a/locale/en/LC_MESSAGES/django.mo and b/locale/en/LC_MESSAGES/django.mo differ
diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 07532566..ff280947 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-05 22:26-0400\n"
+"POT-Creation-Date: 2009-08-12 15:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,16 +16,145 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: settings.py:12
+#: settings.py:12 urls.py:25 forum/views.py:304 forum/views.py:698
 msgid "account/"
 msgstr ""
 
-#: settings.py:12 django_authopenid/urls.py:9 django_authopenid/urls.py:10
-#: django_authopenid/urls.py:11 django_authopenid/urls.py:13
-#: forum/views.py:304 templates/authopenid/confirm_email.txt:10
+#: settings.py:12 urls.py:26 django_authopenid/urls.py:9
+#: django_authopenid/urls.py:10 django_authopenid/urls.py:11
+#: django_authopenid/urls.py:13 forum/views.py:304 forum/views.py:699
+#: templates/authopenid/confirm_email.txt:10
 msgid "signin/"
 msgstr ""
 
+#: urls.py:22
+msgid "upfiles/"
+msgstr ""
+
+#: urls.py:27 urls.py:28 urls.py:29 django_authopenid/urls.py:26
+#: django_authopenid/urls.py:27
+msgid "email/"
+msgstr ""
+
+#: urls.py:27
+msgid "change/"
+msgstr ""
+
+#: urls.py:28
+msgid "sendkey/"
+msgstr ""
+
+#: urls.py:29
+msgid "verify/"
+msgstr ""
+
+#: urls.py:30
+msgid "about/"
+msgstr ""
+
+#: urls.py:31
+msgid "faq/"
+msgstr ""
+
+#: urls.py:32
+msgid "privacy/"
+msgstr ""
+
+#: urls.py:33
+msgid "logout/"
+msgstr ""
+
+#: urls.py:34 urls.py:35 urls.py:36 urls.py:48 forum/models.py:418
+msgid "answers/"
+msgstr ""
+
+#: urls.py:34 urls.py:46
+msgid "comments/"
+msgstr ""
+
+#: urls.py:35 urls.py:40 urls.py:54 templates/user_info.html:34
+msgid "edit/"
+msgstr ""
+
+#: urls.py:36 urls.py:45
+msgid "revisions/"
+msgstr ""
+
+#: urls.py:37 urls.py:38 urls.py:39 urls.py:40 urls.py:41 urls.py:42
+#: urls.py:43 urls.py:44 urls.py:45 urls.py:46 urls.py:47 forum/feed.py:19
+#: forum/models.py:306 forum/views.py:1416
+msgid "questions/"
+msgstr ""
+
+#: urls.py:38 urls.py:64
+msgid "ask/"
+msgstr ""
+
+#: urls.py:39
+msgid "unanswered/"
+msgstr ""
+
+#: urls.py:41
+msgid "close/"
+msgstr ""
+
+#: urls.py:42
+msgid "reopen/"
+msgstr ""
+
+#: urls.py:43
+msgid "answer/"
+msgstr ""
+
+#: urls.py:44
+msgid "vote/"
+msgstr ""
+
+#: urls.py:47 urls.py:48 django_authopenid/urls.py:29
+msgid "delete/"
+msgstr ""
+
+#: urls.py:50
+msgid "question/"
+msgstr ""
+
+#: urls.py:51 urls.py:52 forum/views.py:740 forum/views.py:2013
+msgid "tags/"
+msgstr ""
+
+#: urls.py:53 urls.py:54 urls.py:55 forum/views.py:993 forum/views.py:997
+#: forum/views.py:1418 forum/views.py:1751 forum/views.py:2015
+msgid "users/"
+msgstr ""
+
+#: urls.py:56 urls.py:57
+msgid "badges/"
+msgstr ""
+
+#: urls.py:58
+msgid "messages/"
+msgstr ""
+
+#: urls.py:58
+msgid "markread/"
+msgstr ""
+
+#: urls.py:60
+msgid "nimda/"
+msgstr ""
+
+#: urls.py:62
+msgid "upload/"
+msgstr ""
+
+#: urls.py:63 urls.py:64 urls.py:65
+msgid "books/"
+msgstr ""
+
+#: urls.py:66
+msgid "search/"
+msgstr ""
+
 #: django_authopenid/forms.py:67 django_authopenid/views.py:102
 msgid "i-names are not supported"
 msgstr ""
@@ -109,7 +238,7 @@ msgstr ""
 msgid "Incorrect username."
 msgstr ""
 
-#: django_authopenid/urls.py:10
+#: django_authopenid/urls.py:10 forum/views.py:304 forum/views.py:699
 msgid "newquestion/"
 msgstr ""
 
@@ -137,8 +266,8 @@ msgstr ""
 msgid "sendpw/"
 msgstr ""
 
-#: django_authopenid/urls.py:29
-msgid "delete/"
+#: django_authopenid/urls.py:27
+msgid "validate/"
 msgstr ""
 
 #: django_authopenid/views.py:108
@@ -146,69 +275,69 @@ msgstr ""
 msgid "OpenID %(openid_url)s is invalid"
 msgstr ""
 
-#: django_authopenid/views.py:417 django_authopenid/views.py:544
+#: django_authopenid/views.py:418 django_authopenid/views.py:545
 msgid "Welcome"
 msgstr "Verification Email from Q&amp;A forum"
 
-#: django_authopenid/views.py:507
+#: django_authopenid/views.py:508
 msgid "Password changed."
 msgstr ""
 
-#: django_authopenid/views.py:519 django_authopenid/views.py:524
+#: django_authopenid/views.py:520 django_authopenid/views.py:525
 msgid "your email needs to be validated"
 msgstr ""
 "Your email needs to be validated. Please see details <a "
 "id='validate_email_alert' href=\"/faq#validate\">here</a>."
 
-#: django_authopenid/views.py:681 django_authopenid/views.py:833
+#: django_authopenid/views.py:682 django_authopenid/views.py:834
 #, python-format
 msgid "No OpenID %s found associated in our database"
 msgstr ""
 
-#: django_authopenid/views.py:685 django_authopenid/views.py:840
+#: django_authopenid/views.py:686 django_authopenid/views.py:841
 #, python-format
 msgid "The OpenID %s isn't associated to current user logged in"
 msgstr ""
 
-#: django_authopenid/views.py:693
+#: django_authopenid/views.py:694
 msgid "Email Changed."
 msgstr ""
 
-#: django_authopenid/views.py:768
+#: django_authopenid/views.py:769
 msgid "This OpenID is already associated with another account."
 msgstr ""
 
-#: django_authopenid/views.py:773
+#: django_authopenid/views.py:774
 #, python-format
 msgid "OpenID %s is now associated with your account."
 msgstr ""
 
-#: django_authopenid/views.py:843
+#: django_authopenid/views.py:844
 msgid "Account deleted."
 msgstr ""
 
-#: django_authopenid/views.py:883
+#: django_authopenid/views.py:884
 msgid "Request for new password"
 msgstr ""
 
-#: django_authopenid/views.py:896
+#: django_authopenid/views.py:897
 msgid "A new password has been sent to your email address."
 msgstr ""
 
-#: django_authopenid/views.py:926
+#: django_authopenid/views.py:927
 #, python-format
 msgid ""
 "Could not change password. Confirmation key '%s'                is not "
 "registered."
 msgstr ""
 
-#: django_authopenid/views.py:935
+#: django_authopenid/views.py:936
 msgid ""
 "Can not change password. User don't exist anymore                 in our "
 "database."
 msgstr ""
 
-#: django_authopenid/views.py:944
+#: django_authopenid/views.py:945
 #, python-format
 msgid "Password changed for %s. You may now sign in."
 msgstr ""
@@ -337,12 +466,8 @@ msgstr ""
 msgid "latest questions"
 msgstr ""
 
-#: forum/feed.py:19
-msgid "questions/"
-msgstr ""
-
-#: forum/forms.py:14 templates/answer_edit_tips.html:34
-#: templates/answer_edit_tips.html.py:38 templates/question_edit_tips.html:31
+#: forum/forms.py:14 templates/answer_edit_tips.html:33
+#: templates/answer_edit_tips.html.py:37 templates/question_edit_tips.html:31
 #: templates/question_edit_tips.html:36
 msgid "title"
 msgstr ""
@@ -363,7 +488,7 @@ msgstr ""
 msgid "question content must be > 10 characters"
 msgstr ""
 
-#: forum/forms.py:45 templates/header.html:30 templates/header.html.py:61
+#: forum/forms.py:45 templates/header.html:30 templates/header.html.py:64
 msgid "tags"
 msgstr ""
 
@@ -390,8 +515,8 @@ msgid ""
 "characters '.-_#'"
 msgstr ""
 
-#: forum/forms.py:75 templates/index.html:57 templates/question.html:199
-#: templates/question.html.py:380 templates/questions.html:58
+#: forum/forms.py:75 templates/index.html:57 templates/question.html:209
+#: templates/question.html.py:395 templates/questions.html:58
 #: templates/questions.html.py:70 templates/unanswered.html:48
 #: templates/unanswered.html.py:60
 msgid "community wiki"
@@ -445,40 +570,44 @@ msgstr ""
 msgid "this email has already been registered, please use another one"
 msgstr ""
 
-#: forum/models.py:238
+#: forum/models.py:246
 #, python-format
 msgid "%(author)s modified the question"
 msgstr ""
 
-#: forum/models.py:242
+#: forum/models.py:250
 #, python-format
 msgid "%(people)s posted %(new_answer_count)s new answers"
 msgstr ""
 
-#: forum/models.py:247
+#: forum/models.py:255
 #, python-format
 msgid "%(people)s commented the question"
 msgstr ""
 
-#: forum/models.py:252
+#: forum/models.py:260
 #, python-format
 msgid "%(people)s commented answers"
 msgstr ""
 
-#: forum/models.py:254
+#: forum/models.py:262
 #, python-format
-msgid "%(people)s commented the answer"
+msgid "%(people)s commented an answer"
 msgstr ""
 
-#: forum/models.py:433 templates/badges.html:52
+#: forum/models.py:306 forum/models.py:418
+msgid "revisions"
+msgstr ""
+
+#: forum/models.py:441 templates/badges.html:51
 msgid "gold"
 msgstr ""
 
-#: forum/models.py:434 templates/badges.html:60
+#: forum/models.py:442 templates/badges.html:59
 msgid "silver"
 msgstr ""
 
-#: forum/models.py:435 templates/badges.html:67
+#: forum/models.py:443 templates/badges.html:66
 msgid "bronze"
 msgstr ""
 
@@ -566,31 +695,27 @@ msgstr ""
 msgid "profile - user preferences"
 msgstr ""
 
-#: forum/views.py:304
-msgid "/account/"
-msgstr ""
-
-#: forum/views.py:943
+#: forum/views.py:947
 #, python-format
 msgid "subscription saved, %(email)s needs validation"
 msgstr ""
 "Your subscription is saved, but email address %(email)s needs to be "
 "validated, please see <a href='/faq#validate'>more details here</a>"
 
-#: forum/views.py:1853
+#: forum/views.py:1860
 msgid "uploading images is limited to users with >60 reputation points"
 msgstr ""
 
-#: forum/views.py:1855
+#: forum/views.py:1862
 msgid "allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'"
 msgstr ""
 
-#: forum/views.py:1857
+#: forum/views.py:1864
 #, python-format
 msgid "maximum upload file size is %sK"
 msgstr ""
 
-#: forum/views.py:1859
+#: forum/views.py:1866
 #, python-format
 msgid ""
 "Error uploading file. Please contact the site administrator. Thank you. %s"
@@ -600,16 +725,16 @@ msgstr ""
 msgid "updates from website"
 msgstr ""
 
-#: forum/templatetags/extra_tags.py:139 forum/templatetags/extra_tags.py:168
-#: templates/header.html:33
+#: forum/templatetags/extra_tags.py:143 forum/templatetags/extra_tags.py:172
+#: templates/header.html:35
 msgid "badges"
 msgstr ""
 
-#: forum/templatetags/extra_tags.py:140 forum/templatetags/extra_tags.py:167
+#: forum/templatetags/extra_tags.py:144 forum/templatetags/extra_tags.py:171
 msgid "reputation points"
 msgstr ""
 
-#: forum/templatetags/extra_tags.py:221
+#: forum/templatetags/extra_tags.py:225
 msgid " ago"
 msgstr ""
 
@@ -684,13 +809,13 @@ msgid "Edit answer"
 msgstr ""
 
 #: templates/answer_edit.html:24 templates/answer_edit.html.py:27
-#: templates/ask.html:25 templates/ask.html.py:28 templates/question.html:40
-#: templates/question.html.py:43 templates/question_edit.html:27
+#: templates/ask.html:25 templates/ask.html.py:28 templates/question.html:43
+#: templates/question.html.py:46 templates/question_edit.html:27
 msgid "hide preview"
 msgstr ""
 
 #: templates/answer_edit.html:27 templates/ask.html:28
-#: templates/question.html:43 templates/question_edit.html:27
+#: templates/question.html:46 templates/question_edit.html:27
 msgid "show preview"
 msgstr ""
 
@@ -710,22 +835,22 @@ msgid "select revision"
 msgstr ""
 
 #: templates/answer_edit.html:62 templates/ask.html:94
-#: templates/question.html:452 templates/question_edit.html:91
+#: templates/question.html:467 templates/question_edit.html:91
 msgid "Toggle the real time Markdown editor preview"
 msgstr ""
 
 #: templates/answer_edit.html:62 templates/ask.html:94
-#: templates/question.html:452 templates/question_edit.html:91
+#: templates/question.html:467 templates/question_edit.html:91
 msgid "toggle preview"
 msgstr ""
 
-#: templates/answer_edit.html:73 templates/question_edit.html:119
-#: templates/question_retag.html:75
+#: templates/answer_edit.html:71 templates/question_edit.html:115
+#: templates/question_retag.html:73
 msgid "Save edit"
 msgstr ""
 
-#: templates/answer_edit.html:74 templates/close.html:29
-#: templates/question_edit.html:120 templates/question_retag.html:76
+#: templates/answer_edit.html:72 templates/close.html:29
+#: templates/question_edit.html:116 templates/question_retag.html:74
 #: templates/reopen.html:30 templates/user_edit.html:83
 #: templates/authopenid/changeemail.html:34
 msgid "Cancel"
@@ -755,40 +880,40 @@ msgstr ""
 msgid "see frequently asked questions"
 msgstr ""
 
-#: templates/answer_edit_tips.html:25 templates/question_edit_tips.html:22
+#: templates/answer_edit_tips.html:24 templates/question_edit_tips.html:22
 msgid "Markdown tips"
 msgstr "Markdown basics"
 
-#: templates/answer_edit_tips.html:28 templates/question_edit_tips.html:25
+#: templates/answer_edit_tips.html:27 templates/question_edit_tips.html:25
 msgid "*italic* or __italic__"
 msgstr ""
 
-#: templates/answer_edit_tips.html:31 templates/question_edit_tips.html:28
+#: templates/answer_edit_tips.html:30 templates/question_edit_tips.html:28
 msgid "**bold** or __bold__"
 msgstr ""
 
-#: templates/answer_edit_tips.html:34 templates/question_edit_tips.html:31
+#: templates/answer_edit_tips.html:33 templates/question_edit_tips.html:31
 msgid "link"
 msgstr ""
 
-#: templates/answer_edit_tips.html:34 templates/answer_edit_tips.html.py:38
+#: templates/answer_edit_tips.html:33 templates/answer_edit_tips.html.py:37
 #: templates/question_edit_tips.html:31 templates/question_edit_tips.html:36
 msgid "text"
 msgstr ""
 
-#: templates/answer_edit_tips.html:38 templates/question_edit_tips.html:36
+#: templates/answer_edit_tips.html:37 templates/question_edit_tips.html:36
 msgid "image"
 msgstr ""
 
-#: templates/answer_edit_tips.html:42 templates/question_edit_tips.html:40
+#: templates/answer_edit_tips.html:41 templates/question_edit_tips.html:40
 msgid "numbered list:"
 msgstr ""
 
-#: templates/answer_edit_tips.html:47 templates/question_edit_tips.html:45
+#: templates/answer_edit_tips.html:46 templates/question_edit_tips.html:45
 msgid "basic HTML tags are also supported"
 msgstr ""
 
-#: templates/answer_edit_tips.html:50 templates/question_edit_tips.html:48
+#: templates/answer_edit_tips.html:49 templates/question_edit_tips.html:48
 msgid "learn more about Markdown"
 msgstr ""
 
@@ -816,15 +941,15 @@ msgstr ""
 "your question now and validate email after that. Your question will saved as "
 "pending meanwhile. "
 
-#: templates/ask.html:108
+#: templates/ask.html:107
 msgid "(required)"
 msgstr ""
 
-#: templates/ask.html:115
+#: templates/ask.html:114
 msgid "Login/signup to post your question"
 msgstr "Login/Signup to Post"
 
-#: templates/ask.html:117
+#: templates/ask.html:116
 msgid "Ask your question"
 msgstr "Ask Your Question"
 
@@ -840,7 +965,7 @@ msgstr ""
 msgid "Badges summary"
 msgstr ""
 
-#: templates/badges.html:17 templates/user_stats.html:113
+#: templates/badges.html:17 templates/user_stats.html:115
 msgid "Badges"
 msgstr ""
 
@@ -862,27 +987,27 @@ msgstr ""
 "a></strong> - what kinds of badges would you like to see and suggest the "
 "activity for which those badges might be awarded."
 
-#: templates/badges.html:49
+#: templates/badges.html:48
 msgid "Community badges"
 msgstr "Badge levels"
 
-#: templates/badges.html:55
+#: templates/badges.html:54
 msgid "gold badge description"
 msgstr ""
 "Gold badge is the highest award in this community. To obtain it have to show "
 "profound knowledge and ability in addition to your active participation."
 
-#: templates/badges.html:63
+#: templates/badges.html:62
 msgid "silver badge description"
 msgstr ""
 "Obtaining silver badge requires significant patience. If you have received "
 "one, that means you have greatly contributed to this community."
 
-#: templates/badges.html:66
+#: templates/badges.html:65
 msgid "bronze badge: often given as a special honor"
 msgstr ""
 
-#: templates/badges.html:70
+#: templates/badges.html:69
 msgid "bronze badge description"
 msgstr ""
 "If you are an active participant in this community, you will be recognized "
@@ -968,11 +1093,10 @@ msgstr ""
 msgid "views"
 msgstr ""
 
-#: templates/book.html:125 templates/index.html:69 templates/question.html:115
-#: templates/question.html.py:486 templates/questions.html:84
-#: templates/questions.html.py:156 templates/tags.html:47
-#: templates/unanswered.html:75 templates/unanswered.html.py:109
-#: templates/users_questions.html:52
+#: templates/book.html:125 templates/index.html:69 templates/question.html:499
+#: templates/questions.html:84 templates/questions.html.py:156
+#: templates/tags.html:49 templates/unanswered.html:75
+#: templates/unanswered.html.py:106 templates/users_questions.html:52
 msgid "using tags"
 msgstr ""
 
@@ -980,7 +1104,7 @@ msgstr ""
 msgid "subscribe to book RSS feed"
 msgstr ""
 
-#: templates/book.html:147 templates/index.html:116
+#: templates/book.html:147 templates/index.html:118
 msgid "subscribe to the questions feed"
 msgstr ""
 
@@ -1036,10 +1160,6 @@ msgstr ""
 msgid "What should I avoid in my answers?"
 msgstr ""
 
-#: templates/faq.html:28 templates/faq.html.py:132
-msgid "site title"
-msgstr ""
-
 #: templates/faq.html:28
 msgid ""
 "is a Q&A site, not a discussion group. Therefore - please avoid having "
@@ -1081,61 +1201,72 @@ msgstr ""
 "rough measure of the community trust to him/her. Various moderation tasks "
 "are gradually assigned to the users based on those points."
 
-#: templates/faq.html:59 templates/user_votes.html:14
+#: templates/faq.html:42
+msgid ""
+"For example, if you ask an interesting question or give a helpful answer, "
+"your input will be upvoted. On the other hand if the answer is misleading - "
+"it will be downvoted. Each vote in favor will generate <strong>10</strong> "
+"points, each vote against will subtract <strong>2</strong> points. There is "
+"a limit of <strong>200</strong> points that can be accumulated per question "
+"or answer. The table below explains reputation point requirements for each "
+"type of moderation task."
+msgstr ""
+
+#: templates/faq.html:53 templates/user_votes.html:14
 msgid "upvote"
 msgstr ""
 
-#: templates/faq.html:63
+#: templates/faq.html:57
 msgid "use tags"
 msgstr ""
 
-#: templates/faq.html:68
+#: templates/faq.html:62
 msgid "add comments"
 msgstr ""
 
-#: templates/faq.html:72 templates/user_votes.html:16
+#: templates/faq.html:66 templates/user_votes.html:16
 msgid "downvote"
 msgstr ""
 
-#: templates/faq.html:75
+#: templates/faq.html:69
 msgid "open and close own questions"
 msgstr ""
 
-#: templates/faq.html:79
+#: templates/faq.html:73
 msgid "retag questions"
 msgstr ""
 
-#: templates/faq.html:83
+#: templates/faq.html:77
 msgid "edit community wiki questions"
 msgstr ""
 
-#: templates/faq.html:87
+#: templates/faq.html:81
 msgid "edit any answer"
 msgstr ""
 
-#: templates/faq.html:91
+#: templates/faq.html:85
 msgid "open any closed question"
 msgstr ""
 
-#: templates/faq.html:95
+#: templates/faq.html:89
 msgid "delete any comment"
 msgstr ""
 
-#: templates/faq.html:99
+#: templates/faq.html:93
 msgid "delete any questions and answers and perform other moderation tasks"
 msgstr ""
 
-#: templates/faq.html:106
+#: templates/faq.html:100
 msgid "how to validate email title"
 msgstr "How to validate email and why?"
 
-#: templates/faq.html:108
+#: templates/faq.html:102
 msgid "how to validate email info"
 msgstr ""
 "<form style='margin:0;padding:0;' action='/email/sendkey/'><p><span class="
 "\"bigger strong\">How?</span> If you have just set or changed your email "
-"address - <strong>check your email and click the included link</strong>."
-"<br/>The link contains a key generated specifically for you. You can also "
+"address - <strong>check your email and click the included link</strong>.<br/"
+">The link contains a key generated specifically for you. You can also "
 "<button style='display:inline' type='submit'><strong>get a new key</strong></"
 "button> and check your email again.</p></form><span class=\"bigger strong"
 "\">Why?</span> Email validation is required to make sure that <strong>only "
@@ -1145,11 +1276,11 @@ msgstr ""
 "- create a unique <a href='/faq#gravatar'><strong>gravatar</strong></a> "
 "personal image.</p>"
 
-#: templates/faq.html:112
+#: templates/faq.html:106
 msgid "what is gravatar"
 msgstr "What is gravatar?"
 
-#: templates/faq.html:113
+#: templates/faq.html:107
 msgid "gravatar faq info"
 msgstr ""
 "<strong>Gravatar</strong> means <strong>g</strong>lobally <strong>r</"
@@ -1160,54 +1291,54 @@ msgstr ""
 "your image</strong> at <a href='http://gravatar.com'><strong>gravatar.com</"
 "strong></a>"
 
-#: templates/faq.html:116
+#: templates/faq.html:110
 msgid "To register, do I need to create new password?"
 msgstr ""
 
-#: templates/faq.html:117
+#: templates/faq.html:111
 msgid ""
 "No, you don't have to. You can login through any service that supports "
 "OpenID, e.g. Google, Yahoo, AOL, etc."
 msgstr ""
 
-#: templates/faq.html:118
+#: templates/faq.html:112
 msgid "Login now!"
 msgstr ""
 
-#: templates/faq.html:123
+#: templates/faq.html:117
 msgid "Why other people can edit my questions/answers?"
 msgstr ""
 
-#: templates/faq.html:124
+#: templates/faq.html:118
 msgid "Goal of this site is..."
 msgstr ""
 
-#: templates/faq.html:124
+#: templates/faq.html:118
 msgid ""
 "So questions and answers can be edited like wiki pages by experienced users "
 "of this site and this improves the overall quality of the knowledge base "
 "content."
 msgstr ""
 
-#: templates/faq.html:125
+#: templates/faq.html:119
 msgid "If this approach is not for you, we respect your choice."
 msgstr ""
 
-#: templates/faq.html:129
+#: templates/faq.html:123
 msgid "Still have questions?"
 msgstr ""
 
-#: templates/faq.html:130
+#: templates/faq.html:124
 msgid "Please ask your question, help make our community better!"
 msgstr ""
 "Please <a href=\"/questions/ask\">ask</a> your question, help make our "
 "community better!"
 
-#: templates/faq.html:132 templates/header.html:29 templates/header.html.py:60
+#: templates/faq.html:126 templates/header.html:29 templates/header.html.py:63
 msgid "questions"
 msgstr ""
 
-#: templates/faq.html:132 templates/index.html:121
+#: templates/faq.html:126 templates/index.html:123
 msgid "."
 msgstr ""
 
@@ -1216,6 +1347,7 @@ msgid "about"
 msgstr ""
 
 #: templates/footer.html:8 templates/header.html:15 templates/index.html:84
+#: templates/question_edit_tips.html:16
 msgid "faq"
 msgstr ""
 
@@ -1251,27 +1383,27 @@ msgstr ""
 msgid "back to home page"
 msgstr ""
 
-#: templates/header.html:31 templates/header.html.py:62
+#: templates/header.html:31 templates/header.html.py:65
 msgid "users"
 msgstr ""
 
-#: templates/header.html:32
+#: templates/header.html:33
 msgid "books"
 msgstr ""
 
-#: templates/header.html:34
+#: templates/header.html:36
 msgid "unanswered questions"
 msgstr "unanswered"
 
-#: templates/header.html:38
+#: templates/header.html:40
 msgid "my profile"
 msgstr ""
 
-#: templates/header.html:42
+#: templates/header.html:44
 msgid "ask a question"
 msgstr ""
 
-#: templates/header.html:57
+#: templates/header.html:59
 msgid "search"
 msgstr ""
 
@@ -1317,11 +1449,10 @@ msgstr ""
 msgid "answers"
 msgstr ""
 
-#: templates/index.html:69 templates/question.html:115
-#: templates/question.html.py:486 templates/questions.html:84
-#: templates/questions.html.py:156 templates/tags.html:47
-#: templates/unanswered.html:75 templates/unanswered.html.py:109
-#: templates/users_questions.html:52
+#: templates/index.html:69 templates/question.html:499
+#: templates/questions.html:84 templates/questions.html.py:156
+#: templates/tags.html:49 templates/unanswered.html:75
+#: templates/unanswered.html.py:106 templates/users_questions.html:52
 msgid "see questions tagged"
 msgstr ""
 
@@ -1333,48 +1464,48 @@ msgstr ""
 msgid "Recent tags"
 msgstr ""
 
-#: templates/index.html:94
+#: templates/index.html:94 templates/question.html:125
 #, python-format
 msgid "see questions tagged '%(tagname)s'"
 msgstr ""
 
-#: templates/index.html:97 templates/index.html.py:121
+#: templates/index.html:97 templates/index.html.py:123
 msgid "popular tags"
 msgstr "tags"
 
-#: templates/index.html:101
+#: templates/index.html:102
 msgid "Recent awards"
 msgstr "Recent badges"
 
-#: templates/index.html:107
+#: templates/index.html:108
 msgid "given to"
 msgstr ""
 
-#: templates/index.html:112
+#: templates/index.html:113
 msgid "all awards"
 msgstr "all badges"
 
-#: templates/index.html:116
+#: templates/index.html:118
 msgid "subscribe to last 30 questions by RSS"
 msgstr ""
 
-#: templates/index.html:121
+#: templates/index.html:123
 msgid "Still looking for more? See"
 msgstr ""
 
-#: templates/index.html:121
+#: templates/index.html:123
 msgid "complete list of questions"
 msgstr "list of all questions"
 
-#: templates/index.html:121
+#: templates/index.html:123
 msgid "or"
 msgstr ""
 
-#: templates/index.html:121
+#: templates/index.html:123
 msgid "Please help us answer"
 msgstr ""
 
-#: templates/index.html:121
+#: templates/index.html:123
 msgid "list of unanswered questions"
 msgstr "unanswered questions"
 
@@ -1460,187 +1591,189 @@ msgstr ""
 msgid "how privacy policies can be changed"
 msgstr ""
 
-#: templates/question.html:69 templates/question.html.py:81
+#: templates/question.html:72 templates/question.html.py:73
+#: templates/question.html:85 templates/question.html.py:87
 msgid "i like this post (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:71 templates/question.html.py:83
-#: templates/question.html:276
+#: templates/question.html:75 templates/question.html.py:89
+#: templates/question.html:289
 msgid "current number of votes"
 msgstr ""
 
-#: templates/question.html:76 templates/question.html.py:87
+#: templates/question.html:80 templates/question.html.py:81
+#: templates/question.html:94 templates/question.html.py:95
 msgid "i dont like this post (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:93
+#: templates/question.html:100 templates/question.html.py:101
 msgid "mark this question as favorite (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:99
+#: templates/question.html:107 templates/question.html.py:108
 msgid "remove favorite mark from this question (click again to restore mark)"
 msgstr ""
 
-#: templates/question.html:124 templates/question.html.py:307
+#: templates/question.html:134 templates/question.html.py:322
 #: templates/revisions_answer.html:53 templates/revisions_question.html:53
 msgid "edit"
 msgstr ""
 
-#: templates/question.html:128 templates/question.html.py:317
+#: templates/question.html:138 templates/question.html.py:332
 msgid "delete"
 msgstr ""
 
-#: templates/question.html:133
+#: templates/question.html:143
 msgid "reopen"
 msgstr ""
 
-#: templates/question.html:138
+#: templates/question.html:148
 msgid "close"
 msgstr ""
 
-#: templates/question.html:144 templates/question.html.py:330
+#: templates/question.html:154 templates/question.html.py:345
 msgid ""
 "report as offensive (i.e containing spam, advertising, malicious text, etc.)"
 msgstr ""
 
-#: templates/question.html:145 templates/question.html.py:331
+#: templates/question.html:155 templates/question.html.py:346
 msgid "flag offensive"
 msgstr ""
 
-#: templates/question.html:157 templates/question.html.py:340
+#: templates/question.html:167 templates/question.html.py:355
 #: templates/revisions_answer.html:65 templates/revisions_question.html:65
 msgid "updated"
 msgstr ""
 
-#: templates/question.html:206 templates/question.html.py:387
+#: templates/question.html:216 templates/question.html.py:402
 #: templates/revisions_answer.html:63 templates/revisions_question.html:63
 msgid "asked"
 msgstr ""
 
-#: templates/question.html:236 templates/question.html.py:414
+#: templates/question.html:246 templates/question.html.py:429
 msgid "comments"
 msgstr ""
 
-#: templates/question.html:237 templates/question.html.py:415
+#: templates/question.html:247 templates/question.html.py:430
 msgid "add comment"
 msgstr ""
 
-#: templates/question.html:250
+#: templates/question.html:260
 #, python-format
 msgid ""
 "The question has been closed for the following reason \"%(question."
 "get_close_reason_display)s\" by"
 msgstr ""
 
-#: templates/question.html:252
+#: templates/question.html:262
 #, python-format
 msgid "close date %(question.closed_at)s"
 msgstr ""
 
-#: templates/question.html:259 templates/user_stats.html:28
+#: templates/question.html:269 templates/user_stats.html:28
 msgid "Answers"
 msgstr " Answers"
 
-#: templates/question.html:261
+#: templates/question.html:271
 msgid "oldest answers will be shown first"
 msgstr ""
 
-#: templates/question.html:261
+#: templates/question.html:271
 msgid "oldest answers"
 msgstr "oldest"
 
-#: templates/question.html:262
+#: templates/question.html:272
 msgid "newest answers will be shown first"
 msgstr ""
 
-#: templates/question.html:262
+#: templates/question.html:272
 msgid "newest answers"
 msgstr "newest"
 
-#: templates/question.html:263
+#: templates/question.html:273
 msgid "most voted answers will be shown first"
 msgstr ""
 
-#: templates/question.html:263
+#: templates/question.html:273
 msgid "popular answers"
 msgstr "most voted"
 
-#: templates/question.html:275
+#: templates/question.html:287 templates/question.html.py:288
 msgid "i like this answer (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:281
+#: templates/question.html:294 templates/question.html.py:295
 msgid "i dont like this answer (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:287
+#: templates/question.html:300 templates/question.html.py:301
 msgid "mark this answer as favorite (click again to undo)"
 msgstr ""
 
-#: templates/question.html:292
+#: templates/question.html:306 templates/question.html.py:307
 msgid "the author of the question has selected this answer as correct"
 msgstr ""
 
-#: templates/question.html:314
+#: templates/question.html:329
 msgid "undelete"
 msgstr ""
 
-#: templates/question.html:324
+#: templates/question.html:339
 msgid "answer permanent link"
 msgstr ""
 
-#: templates/question.html:325
+#: templates/question.html:340
 msgid "permanent link"
 msgstr ""
 
-#: templates/question.html:438
+#: templates/question.html:453
 msgid "Your answer"
 msgstr ""
 
-#: templates/question.html:441
+#: templates/question.html:456
 msgid "you can answer anonymously and then login"
 msgstr ""
 "<span class='strong big'>You are now not logged in</span> but you can answer "
 "first and then login"
 
-#: templates/question.html:465
+#: templates/question.html:479
 msgid "Answer the question"
 msgstr ""
 
-#: templates/question.html:467
+#: templates/question.html:481
 msgid "Notify me daily if there are any new answers."
 msgstr ""
 
-#: templates/question.html:469
+#: templates/question.html:483
 msgid "once you sign in you will be able to subscribe for any updates here"
 msgstr "Here logged in users can sign up for the question updates."
 
-#: templates/question.html:481
+#: templates/question.html:494
 msgid "Question tags"
 msgstr "Tags"
 
-#: templates/question.html:491
+#: templates/question.html:504
 msgid "question asked"
 msgstr "Asked"
 
-#: templates/question.html:491 templates/question.html.py:497
+#: templates/question.html:504 templates/question.html.py:510
 #: templates/user_info.html:51
 msgid "ago"
 msgstr ""
 
-#: templates/question.html:494
+#: templates/question.html:507
 msgid "question was seen"
 msgstr "Seen"
 
-#: templates/question.html:494
+#: templates/question.html:507
 msgid "times"
 msgstr ""
 
-#: templates/question.html:497
+#: templates/question.html:510
 msgid "last updated"
 msgstr "Last updated"
 
-#: templates/question.html:502
+#: templates/question.html:515
 msgid "Related questions"
 msgstr ""
 
@@ -1668,15 +1801,15 @@ msgstr ""
 msgid "up to 5 tags, less than 20 characters each"
 msgstr ""
 
-#: templates/question_retag.html:86
+#: templates/question_retag.html:82
 msgid "Why use and modify tags?"
 msgstr ""
 
-#: templates/question_retag.html:89
+#: templates/question_retag.html:85
 msgid "tags help us keep Questions organized"
 msgstr ""
 
-#: templates/question_retag.html:95
+#: templates/question_retag.html:91
 msgid "tag editors receive special awards from the community"
 msgstr ""
 
@@ -1720,8 +1853,8 @@ msgstr[0] ""
 "class=\"tag\">%(tagname)s</span>"
 msgstr[1] ""
 "\n"
-"<span class=\"questions-count\">%(q_num)s</span><br/>questions tagged "
-"<span class=\"tag\">%(tagname)s</span>"
+"<span class=\"questions-count\">%(q_num)s</span><br/>questions tagged <span "
+"class=\"tag\">%(tagname)s</span>"
 
 #: templates/questions.html:116
 #, python-format
@@ -1787,7 +1920,7 @@ msgstr ""
 msgid "Most voted questions are shown first."
 msgstr ""
 
-#: templates/questions.html:153 templates/unanswered.html:105
+#: templates/questions.html:153 templates/unanswered.html:102
 msgid "Related tags"
 msgstr "Tags"
 
@@ -1824,35 +1957,35 @@ msgstr ""
 msgid "Revision history"
 msgstr ""
 
-#: templates/tags.html:6 templates/tags.html.py:29
+#: templates/tags.html:6 templates/tags.html.py:30
 msgid "Tag list"
 msgstr ""
 
-#: templates/tags.html:31
+#: templates/tags.html:32
 msgid "sorted alphabetically"
 msgstr ""
 
-#: templates/tags.html:31
+#: templates/tags.html:32
 msgid "by name"
 msgstr ""
 
-#: templates/tags.html:32
+#: templates/tags.html:33
 msgid "sorted by frequency of tag use"
 msgstr ""
 
-#: templates/tags.html:32
+#: templates/tags.html:33
 msgid "by popularity"
 msgstr ""
 
-#: templates/tags.html:38
+#: templates/tags.html:39
 msgid "All tags matching query"
 msgstr ""
 
-#: templates/tags.html:38
+#: templates/tags.html:39
 msgid "all tags - make this empty in english"
 msgstr ""
 
-#: templates/tags.html:41
+#: templates/tags.html:42
 msgid "Nothing found"
 msgstr ""
 
@@ -1864,12 +1997,8 @@ msgstr ""
 #, python-format
 msgid "have %(num_q)s unanswered questions"
 msgstr ""
-"<span class=\"questions-count\">%(num_q)s</span><br/><strong>unanswered</strong> "
-"questions"
-
-#: templates/unanswered.html:99
-msgid "Have a total of"
-msgstr ""
+"<span class=\"questions-count\">%(num_q)s</span><br/> questions with "
+"<strong>no accepted answers</strong>"
 
 #: templates/user_edit.html:6
 msgid "Edit user profile"
@@ -1939,61 +2068,61 @@ msgstr ""
 msgid "Connect with Twitter"
 msgstr ""
 
-#: templates/user_preferences.html:12
+#: templates/user_preferences.html:13
 msgid "Twitter account name:"
 msgstr ""
 
-#: templates/user_preferences.html:14
+#: templates/user_preferences.html:15
 msgid "Twitter password:"
 msgstr ""
 
-#: templates/user_preferences.html:16
+#: templates/user_preferences.html:17
 msgid "Send my Questions to Twitter"
 msgstr ""
 
-#: templates/user_preferences.html:17
+#: templates/user_preferences.html:18
 msgid "Send my Answers to Twitter"
 msgstr ""
 
-#: templates/user_preferences.html:18
+#: templates/user_preferences.html:19
 msgid "Save"
 msgstr ""
 
-#: templates/user_stats.html:15
+#: templates/user_stats.html:16
 msgid "User questions"
 msgstr ""
 
-#: templates/user_stats.html:37
+#: templates/user_stats.html:38
 #, python-format
 msgid "the answer has been voted for %(vote_count)s times"
 msgstr ""
 
-#: templates/user_stats.html:37
+#: templates/user_stats.html:38
 msgid "this answer has been selected as correct"
 msgstr ""
 
-#: templates/user_stats.html:43
+#: templates/user_stats.html:46
 #, python-format
-msgid "the answer has been commented %(answered_question.comment_count)s times"
-msgstr ""
+msgid "the answer has been commented %(comment_count)s times"
+msgstr "(%(comment_count)s comment(s))"
 
-#: templates/user_stats.html:56
+#: templates/user_stats.html:60
 msgid "votes total"
 msgstr "Votes"
 
-#: templates/user_stats.html:65
+#: templates/user_stats.html:69
 msgid "user has voted up this many times"
 msgstr ""
 
-#: templates/user_stats.html:70
+#: templates/user_stats.html:74
 msgid "user voted down this many times"
 msgstr ""
 
-#: templates/user_stats.html:84
+#: templates/user_stats.html:87
 msgid "Tags"
 msgstr ""
 
-#: templates/user_stats.html:94
+#: templates/user_stats.html:97
 #, python-format
 msgid "see other questions tagged '%(tag)s' "
 msgstr ""
@@ -2078,7 +2207,7 @@ msgstr ""
 "anyone, must be valid)"
 
 #: templates/authopenid/changeemail.html:31
-#: templates/authopenid/signin.html:138
+#: templates/authopenid/signin.html:136
 msgid "Password"
 msgstr ""
 
@@ -2207,7 +2336,7 @@ msgid "This account already exists, please use another."
 msgstr ""
 
 #: templates/authopenid/complete.html:19 templates/authopenid/complete.html:32
-#: templates/authopenid/signin.html:121
+#: templates/authopenid/signin.html:120
 msgid "Sorry, looks like we have some errors:"
 msgstr ""
 
@@ -2241,7 +2370,7 @@ msgstr ""
 msgid "Register"
 msgstr ""
 
-#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:140
+#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:138
 msgid "Forgot your password?"
 msgstr ""
 
@@ -2432,8 +2561,9 @@ msgid "Click to sign in through any of these services."
 msgstr ""
 "<p><span class=\"big strong\">We accept <a href=\"http://openid.net"
 "\">OpenID</a> login.</span> <font color=\"gray\">Instead of creating a new "
-"password - log in through any of the services below.</font></p><p><span class=\"big "
-"strong\">1. Select the login service by clicking one of the icons</span></p>"
+"password - log in through any of the services below.</font></p><p><span "
+"class=\"big strong\">1. Select the login service by clicking one of the "
+"icons</span></p>"
 
 #: templates/authopenid/signin.html:103
 msgid "Enter your <span id=\"enter_your_what\">Provider user name</span>"
@@ -2451,7 +2581,7 @@ msgstr ""
 "\"http://openid.net\">OpenID</a> web address</span><br/>(or choose specific "
 "provider by clicking on one of the icons above)"
 
-#: templates/authopenid/signin.html:112 templates/authopenid/signin.html:139
+#: templates/authopenid/signin.html:112 templates/authopenid/signin.html:137
 msgid "Login"
 msgstr ""
 
@@ -2461,45 +2591,45 @@ msgstr ""
 "You can log in either through one of these services or traditionally - using "
 "local username/password."
 
-#: templates/authopenid/signin.html:136
+#: templates/authopenid/signin.html:134
 msgid "Use login name and password"
 msgstr ""
 
-#: templates/authopenid/signin.html:137
+#: templates/authopenid/signin.html:135
 msgid "Login name"
 msgstr ""
 
-#: templates/authopenid/signin.html:141
+#: templates/authopenid/signin.html:139
 msgid "Create new account"
 msgstr ""
 
-#: templates/authopenid/signin.html:150
+#: templates/authopenid/signin.html:148
 msgid "Why use OpenID?"
 msgstr ""
 
-#: templates/authopenid/signin.html:154
+#: templates/authopenid/signin.html:151
 msgid "with openid it is easier"
 msgstr "With the OpenID you don't need to create new username and password."
 
-#: templates/authopenid/signin.html:157
+#: templates/authopenid/signin.html:154
 msgid "reuse openid"
 msgstr "You can safely re-use the same login for all OpenID-enabled websites."
 
-#: templates/authopenid/signin.html:160
+#: templates/authopenid/signin.html:157
 msgid "openid is widely adopted"
 msgstr ""
 "There are > 160,000,000 OpenID account in use. Over 10,000 sites are OpenID-"
 "enabled."
 
-#: templates/authopenid/signin.html:163
+#: templates/authopenid/signin.html:160
 msgid "openid is supported open standard"
 msgstr "OpenID is based on an open standard, supported by many organizations."
 
-#: templates/authopenid/signin.html:167
+#: templates/authopenid/signin.html:165
 msgid "Find out more"
 msgstr ""
 
-#: templates/authopenid/signin.html:168
+#: templates/authopenid/signin.html:166
 msgid "Get OpenID"
 msgstr ""
 
@@ -2533,11 +2663,11 @@ msgstr ""
 msgid "back to login"
 msgstr ""
 
-#: templates/authopenid/signup.html:48
+#: templates/authopenid/signup.html:46
 msgid "Register with your OpenID"
 msgstr ""
 
-#: templates/authopenid/signup.html:51
+#: templates/authopenid/signup.html:49
 msgid "Login with your OpenID"
 msgstr ""
 
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
new file mode 100644
index 00000000..fc7ebe14
Binary files /dev/null and b/locale/es/LC_MESSAGES/django.mo differ
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 16ccc51a..b528fcf2 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-11 15:39-0300\n"
+"POT-Creation-Date: 2009-08-12 15:53+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Bruno Sarlo <bsarlo@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,7 @@ msgstr "cuenta/"
 #: settings.py:12 urls.py:26 django_authopenid/urls.py:9
 #: django_authopenid/urls.py:10 django_authopenid/urls.py:11
 #: django_authopenid/urls.py:13 forum/views.py:304 forum/views.py:699
+#: templates/authopenid/confirm_email.txt:10
 msgid "signin/"
 msgstr "ingresar/"
 
@@ -57,7 +58,7 @@ msgstr "códigodeprivacidad/"
 msgid "logout/"
 msgstr "cerrarsesion/"
 
-#: urls.py:34 urls.py:35 urls.py:36 urls.py:48
+#: urls.py:34 urls.py:35 urls.py:36 urls.py:48 forum/models.py:418
 msgid "answers/"
 msgstr "respuestas/"
 
@@ -75,7 +76,7 @@ msgstr "revisiones/"
 
 #: urls.py:37 urls.py:38 urls.py:39 urls.py:40 urls.py:41 urls.py:42
 #: urls.py:43 urls.py:44 urls.py:45 urls.py:46 urls.py:47 forum/feed.py:19
-#: forum/views.py:1416
+#: forum/models.py:306 forum/views.py:1416
 msgid "questions/"
 msgstr "preguntas/"
 
@@ -268,9 +269,8 @@ msgid "sendpw/"
 msgstr "enviarcontrasena/"
 
 #: django_authopenid/urls.py:27
-#, fuzzy
 msgid "validate/"
-msgstr "Cambiar dirección email"
+msgstr ""
 
 #: django_authopenid/views.py:108
 #, python-format
@@ -383,9 +383,6 @@ msgid "question"
 msgstr "pregunta"
 
 #: forum/const.py:57 templates/book.html:110
-#: templates/book.html.BASE.30295.html:110
-#: templates/book.html.LOCAL.30295.html:110
-#: templates/book.html.REMOTE.30295.html:110
 msgid "answer"
 msgstr "respuesta"
 
@@ -495,7 +492,7 @@ msgstr "contenido"
 msgid "question content must be > 10 characters"
 msgstr "el contenido de la pregunta debe ser al menos de 10 caracteres"
 
-#: forum/forms.py:45 templates/header.html:34 templates/header.html.py:63
+#: forum/forms.py:45 templates/header.html:30 templates/header.html.py:64
 msgid "tags"
 msgstr "etiquetas"
 
@@ -530,7 +527,6 @@ msgstr ""
 #: templates/question.html.py:395 templates/questions.html:58
 #: templates/questions.html.py:70 templates/unanswered.html:48
 #: templates/unanswered.html.py:60
-#, fuzzy
 msgid "community wiki"
 msgstr "wiki de comunidad"
 
@@ -587,9 +583,8 @@ msgid "this email has already been registered, please use another one"
 msgstr "este email ya ha sido registrado, por favor use otro"
 
 #: forum/models.py:246
-#, fuzzy, python-format
 msgid "%(author)s modified the question"
-msgstr "%(author) modificó la pregunta"
+msgstr "%(author)s modificó la pregunta"
 
 #: forum/models.py:250
 #, python-format
@@ -607,10 +602,14 @@ msgid "%(people)s commented answers"
 msgstr "%(people)s comentaron la respuesta"
 
 #: forum/models.py:262
-#, fuzzy, python-format
+#, python-format
 msgid "%(people)s commented an answer"
 msgstr "%(people)s comentaron la respuesta"
 
+#: forum/models.py:306 forum/models.py:418
+msgid "revisions"
+msgstr "revisiones/"
+
 #: forum/models.py:441 templates/badges.html:51
 msgid "gold"
 msgstr "oro"
@@ -739,7 +738,7 @@ msgid "updates from website"
 msgstr "actualizaciones del sitio"
 
 #: forum/templatetags/extra_tags.py:143 forum/templatetags/extra_tags.py:172
-#: templates/header.html:37
+#: templates/header.html:35
 msgid "badges"
 msgstr "distinciones"
 
@@ -893,7 +892,6 @@ msgid "be clear and concise"
 msgstr "ser claro y conciso"
 
 #: templates/answer_edit_tips.html:19 templates/question_edit_tips.html:16
-#, fuzzy
 msgid "see frequently asked questions"
 msgstr "ver preguntas frecuentes"
 
@@ -982,7 +980,7 @@ msgstr "Usuarios han sido galardonados con distinciones:"
 msgid "Badges summary"
 msgstr "Resumen de distinciones"
 
-#: templates/badges.html:17 templates/user_stats.html:114
+#: templates/badges.html:17 templates/user_stats.html:115
 msgid "Badges"
 msgstr "Distinciones"
 
@@ -1026,152 +1024,98 @@ msgstr ""
 "Si eres un usuario activo de esta comunidad, recibirás esta distinción - de "
 "todas maneras es un honor especial."
 
-#: templates/book.html:7 templates/book.html.BASE.30295.html:7
-#: templates/book.html.LOCAL.30295.html:7
-#: templates/book.html.REMOTE.30295.html:7
+#: templates/book.html:7
 msgid "reading channel"
 msgstr "canal de lectura"
 
-#: templates/book.html:26 templates/book.html.BASE.30295.html:26
-#: templates/book.html.LOCAL.30295.html:26
-#: templates/book.html.REMOTE.30295.html:26
+#: templates/book.html:26
 msgid "[author]"
 msgstr "[autor]"
 
-#: templates/book.html:30 templates/book.html.BASE.30295.html:30
-#: templates/book.html.LOCAL.30295.html:30
-#: templates/book.html.REMOTE.30295.html:30
+#: templates/book.html:30
 msgid "[publisher]"
 msgstr "[editorial]"
 
-#: templates/book.html:34 templates/book.html.BASE.30295.html:34
-#: templates/book.html.LOCAL.30295.html:34
-#: templates/book.html.REMOTE.30295.html:34
+#: templates/book.html:34
 msgid "[publication date]"
 msgstr "[fecha de publicación]"
 
-#: templates/book.html:38 templates/book.html.BASE.30295.html:38
-#: templates/book.html.LOCAL.30295.html:38
-#: templates/book.html.REMOTE.30295.html:38
+#: templates/book.html:38
 msgid "[price]"
 msgstr "[precio]"
 
-#: templates/book.html:39 templates/book.html.BASE.30295.html:39
-#: templates/book.html.LOCAL.30295.html:39
-#: templates/book.html.REMOTE.30295.html:39
+#: templates/book.html:39
 msgid "currency unit"
 msgstr "unidad de moneda"
 
-#: templates/book.html:42 templates/book.html.BASE.30295.html:42
-#: templates/book.html.LOCAL.30295.html:42
-#: templates/book.html.REMOTE.30295.html:42
+#: templates/book.html:42
 msgid "[pages]"
 msgstr "[páginas]"
 
-#: templates/book.html:43 templates/book.html.BASE.30295.html:43
-#: templates/book.html.LOCAL.30295.html:43
-#: templates/book.html.REMOTE.30295.html:43
+#: templates/book.html:43
 msgid "pages abbreviation"
 msgstr "abreviación de páginas"
 
-#: templates/book.html:46 templates/book.html.BASE.30295.html:46
-#: templates/book.html.LOCAL.30295.html:46
-#: templates/book.html.REMOTE.30295.html:46
+#: templates/book.html:46
 msgid "[tags]"
 msgstr "[etiquetas]"
 
-#: templates/book.html:56 templates/book.html.BASE.30295.html:56
-#: templates/book.html.LOCAL.30295.html:56
-#: templates/book.html.REMOTE.30295.html:56
+#: templates/book.html:56
 msgid "author blog"
 msgstr "blog del autor"
 
-#: templates/book.html:62 templates/book.html.BASE.30295.html:62
-#: templates/book.html.LOCAL.30295.html:62
-#: templates/book.html.REMOTE.30295.html:62
+#: templates/book.html:62
 msgid "book directory"
 msgstr "directorio del libro"
 
-#: templates/book.html:66 templates/book.html.BASE.30295.html:66
-#: templates/book.html.LOCAL.30295.html:66
-#: templates/book.html.REMOTE.30295.html:66
+#: templates/book.html:66
 msgid "buy online"
 msgstr "comprar en-linea"
 
-#: templates/book.html:79 templates/book.html.BASE.30295.html:79
-#: templates/book.html.LOCAL.30295.html:79
-#: templates/book.html.REMOTE.30295.html:79
+#: templates/book.html:79
 msgid "reader questions"
 msgstr "pregunta de lector"
 
-#: templates/book.html:82 templates/book.html.BASE.30295.html:82
-#: templates/book.html.LOCAL.30295.html:82
-#: templates/book.html.REMOTE.30295.html:82
+#: templates/book.html:82
 msgid "ask the author"
 msgstr "preguntar al autor"
 
 #: templates/book.html:88 templates/book.html.py:93
-#: templates/book.html.BASE.30295.html:88
-#: templates/book.html.BASE.30295.html:93
-#: templates/book.html.LOCAL.30295.html:88
-#: templates/book.html.LOCAL.30295.html:93
-#: templates/book.html.REMOTE.30295.html:88
-#: templates/book.html.REMOTE.30295.html:93 templates/users_questions.html:17
+#: templates/users_questions.html:17
 msgid "this question was selected as favorite"
 msgstr "esta pregunta ha sido seleccionada como favorita"
 
 #: templates/book.html:88 templates/book.html.py:93
-#: templates/book.html.BASE.30295.html:88
-#: templates/book.html.BASE.30295.html:93
-#: templates/book.html.LOCAL.30295.html:88
-#: templates/book.html.LOCAL.30295.html:93
-#: templates/book.html.REMOTE.30295.html:88
-#: templates/book.html.REMOTE.30295.html:93 templates/users_questions.html:11
-#: templates/users_questions.html.py:17
+#: templates/users_questions.html:11 templates/users_questions.html.py:17
 msgid "number of times"
 msgstr "numero de veces"
 
-#: templates/book.html:105 templates/book.html.BASE.30295.html:105
-#: templates/book.html.LOCAL.30295.html:105
-#: templates/book.html.REMOTE.30295.html:105 templates/index.html:48
-#: templates/questions.html:46 templates/unanswered.html:37
-#: templates/users_questions.html:30
+#: templates/book.html:105 templates/index.html:48 templates/questions.html:46
+#: templates/unanswered.html:37 templates/users_questions.html:30
 msgid "votes"
 msgstr "votos"
 
-#: templates/book.html:108 templates/book.html.BASE.30295.html:108
-#: templates/book.html.LOCAL.30295.html:108
-#: templates/book.html.REMOTE.30295.html:108
+#: templates/book.html:108
 msgid "the answer has been accepted to be correct"
 msgstr "la respuesta ha sido aceptada como correcta"
 
-#: templates/book.html:115 templates/book.html.BASE.30295.html:115
-#: templates/book.html.LOCAL.30295.html:115
-#: templates/book.html.REMOTE.30295.html:115 templates/index.html:49
-#: templates/questions.html:47 templates/unanswered.html:38
-#: templates/users_questions.html:40
+#: templates/book.html:115 templates/index.html:49 templates/questions.html:47
+#: templates/unanswered.html:38 templates/users_questions.html:40
 msgid "views"
 msgstr "vistas"
 
-#: templates/book.html:125 templates/book.html.BASE.30295.html:125
-#: templates/book.html.LOCAL.30295.html:125
-#: templates/book.html.REMOTE.30295.html:125 templates/index.html:69
-#: templates/question.html:125 templates/question.html.py:499
+#: templates/book.html:125 templates/index.html:69 templates/question.html:499
 #: templates/questions.html:84 templates/questions.html.py:156
 #: templates/tags.html:49 templates/unanswered.html:75
 #: templates/unanswered.html.py:106 templates/users_questions.html:52
 msgid "using tags"
 msgstr "usando etiquetas"
 
-#: templates/book.html:147 templates/book.html.BASE.30295.html:147
-#: templates/book.html.LOCAL.30295.html:147
-#: templates/book.html.REMOTE.30295.html:147
+#: templates/book.html:147
 msgid "subscribe to book RSS feed"
 msgstr "suscribirse al RSS del libro"
 
-#: templates/book.html:147 templates/book.html.BASE.30295.html:147
-#: templates/book.html.LOCAL.30295.html:147
-#: templates/book.html.REMOTE.30295.html:147 templates/index.html:118
+#: templates/book.html:147 templates/index.html:118
 msgid "subscribe to the questions feed"
 msgstr "suscribirse al agregado de noticias"
 
@@ -1231,10 +1175,6 @@ msgstr ""
 msgid "What should I avoid in my answers?"
 msgstr "¿Que debo evitar en mis respuestas?"
 
-#: templates/faq.html:28 templates/faq.html.py:126
-msgid "site title"
-msgstr "Preguntalo.com.uy"
-
 #: templates/faq.html:28
 msgid ""
 "is a Q&A site, not a discussion group. Therefore - please avoid having "
@@ -1427,7 +1367,7 @@ msgstr "¿Aún tienes preguntas?"
 msgid "Please ask your question, help make our community better!"
 msgstr "Por favor haz tu pregunta, ¡ayudanos a mejorar nuestra comunidad!"
 
-#: templates/faq.html:126 templates/header.html:33 templates/header.html.py:62
+#: templates/faq.html:126 templates/header.html:29 templates/header.html.py:63
 msgid "questions"
 msgstr "preguntas"
 
@@ -1476,29 +1416,27 @@ msgstr "entrar"
 msgid "back to home page"
 msgstr "volver página principal"
 
-#: templates/header.html:30
-msgid "ask a question"
-msgstr "hacer una pregunta"
-
-#: templates/header.html:35 templates/header.html.py:64
+#: templates/header.html:31 templates/header.html.py:65
 msgid "users"
 msgstr "usuarios"
 
-#: templates/header.html:36
-#, fuzzy
+#: templates/header.html:33
 msgid "books"
 msgstr "libros"
 
-#: templates/header.html:38
+#: templates/header.html:36
 msgid "unanswered questions"
 msgstr "sin respuesta"
 
-#: templates/header.html:42
+#: templates/header.html:40
 msgid "my profile"
 msgstr "mi perfil"
 
-#: templates/header.html:58
-#, fuzzy
+#: templates/header.html:44
+msgid "ask a question"
+msgstr "hacer una pregunta"
+
+#: templates/header.html:59
 msgid "search"
 msgstr "buscar"
 
@@ -1511,7 +1449,6 @@ msgid "Questions"
 msgstr "Preguntas"
 
 #: templates/index.html:24
-#, fuzzy
 msgid "last updated questions"
 msgstr "ultimas preguntas actualizadas"
 
@@ -1545,11 +1482,10 @@ msgstr "todas las preguntas"
 msgid "answers"
 msgstr "respuestas"
 
-#: templates/index.html:69 templates/question.html:125
-#: templates/question.html.py:499 templates/questions.html:84
-#: templates/questions.html.py:156 templates/tags.html:49
-#: templates/unanswered.html:75 templates/unanswered.html.py:106
-#: templates/users_questions.html:52
+#: templates/index.html:69 templates/question.html:499
+#: templates/questions.html:84 templates/questions.html.py:156
+#: templates/tags.html:49 templates/unanswered.html:75
+#: templates/unanswered.html.py:106 templates/users_questions.html:52
 msgid "see questions tagged"
 msgstr "ver preguntas etiquetadas"
 
@@ -1561,7 +1497,7 @@ msgstr "bienvenido a sitio"
 msgid "Recent tags"
 msgstr "Etiquetas recientes"
 
-#: templates/index.html:94
+#: templates/index.html:94 templates/question.html:125
 #, python-format
 msgid "see questions tagged '%(tagname)s'"
 msgstr "ver preguntas etiquetadas '%(tagname)s'"
@@ -1595,7 +1531,6 @@ msgid "complete list of questions"
 msgstr "lista completa de preguntas"
 
 #: templates/index.html:123
-#, fuzzy
 msgid "or"
 msgstr "ó"
 
@@ -1648,7 +1583,6 @@ msgid "next page"
 msgstr "próxima página"
 
 #: templates/privacy.html:6 templates/privacy.html.py:11
-#, fuzzy
 msgid "Privacy policy"
 msgstr "Privacidad"
 
@@ -1657,7 +1591,6 @@ msgid "general message about privacy"
 msgstr "mensaje de privacidad"
 
 #: templates/privacy.html:18
-#, fuzzy
 msgid "Site Visitors"
 msgstr "Visitantes del Sitio"
 
@@ -1777,7 +1710,7 @@ msgstr ""
 msgid "close date %(question.closed_at)s"
 msgstr "fecha de cerrada %(question.closed_at)s"
 
-#: templates/question.html:269 templates/user_stats.html:29
+#: templates/question.html:269 templates/user_stats.html:28
 msgid "Answers"
 msgstr "Respuestas"
 
@@ -1856,7 +1789,6 @@ msgstr ""
 "actualizaciones aquí."
 
 #: templates/question.html:494
-#, fuzzy
 msgid "Question tags"
 msgstr "Tags de la pregunta"
 
@@ -1866,7 +1798,6 @@ msgstr "pregunta preguntada"
 
 #: templates/question.html:504 templates/question.html.py:510
 #: templates/user_info.html:51
-#, fuzzy
 msgid "ago"
 msgstr " atras"
 
@@ -1967,7 +1898,7 @@ msgstr[1] ""
 "\t\t\t"
 
 #: templates/questions.html:116
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "\n"
 "\t\t\t\thave total %(q_num)s questions containing %(searchtitle)s\n"
@@ -2061,7 +1992,6 @@ msgstr "Re-abrir esta pregunta"
 
 #: templates/revisions_answer.html:7 templates/revisions_answer.html.py:36
 #: templates/revisions_question.html:8 templates/revisions_question.html:36
-#, fuzzy
 msgid "Revision history"
 msgstr "Historial de revisiones"
 
@@ -2109,7 +2039,6 @@ msgstr ""
 "respuesta</strong> "
 
 #: templates/user_edit.html:6
-#, fuzzy
 msgid "Edit user profile"
 msgstr "Editar perfil de usuario"
 
@@ -2134,7 +2063,6 @@ msgid "Update"
 msgstr "Actualización"
 
 #: templates/user_info.html:34
-#, fuzzy
 msgid "update profile"
 msgstr "actualizar perfil de usuario"
 
@@ -2211,35 +2139,33 @@ msgstr "la respuesta ha sido votada %(vote_count)s veces"
 msgid "this answer has been selected as correct"
 msgstr "esta respuesta ha sido seleccionada como correcta"
 
-#: templates/user_stats.html:44
-#, fuzzy, python-format
+#: templates/user_stats.html:46
+#, python-format
 msgid "the answer has been commented %(comment_count)s times"
-msgstr ""
-"la respuesta ha sido comentada %(answered_question.comment_count)s veces"
+msgstr "la respuesta ha sido comentada %(comment_count)s veces"
 
-#: templates/user_stats.html:57
+#: templates/user_stats.html:60
 msgid "votes total"
 msgstr "votos totales"
 
-#: templates/user_stats.html:66
+#: templates/user_stats.html:69
 msgid "user has voted up this many times"
 msgstr "el usuario ha votado positivo esta cantidad de veces"
 
-#: templates/user_stats.html:71
+#: templates/user_stats.html:74
 msgid "user voted down this many times"
 msgstr "el usuario voto negativo esta cantidad de veces"
 
-#: templates/user_stats.html:85
+#: templates/user_stats.html:87
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: templates/user_stats.html:95
+#: templates/user_stats.html:97
 #, python-format
 msgid "see other questions tagged '%(tag)s' "
 msgstr "ver otras preguntas etiqueteadas '%(tag)s'"
 
 #: templates/user_tabs.html:7
-#, fuzzy
 msgid "User profile"
 msgstr "Perfil de usuario"
 
@@ -2252,7 +2178,6 @@ msgid "reputation history"
 msgstr "historial de reputación"
 
 #: templates/user_tabs.html:24
-#, fuzzy
 msgid "favorites"
 msgstr "favoritos"
 
@@ -2299,9 +2224,9 @@ msgid "Change email"
 msgstr "Cambiar dirección email"
 
 #: templates/authopenid/changeemail.html:10
-#, fuzzy, python-format
+#, python-format
 msgid "change %(email)s info"
-msgstr "Cambiar información del correo electrónico "
+msgstr "Cambiar información del correo electrónico %(email)s"
 
 #: templates/authopenid/changeemail.html:13
 #: templates/authopenid/changeopenid.html:14
@@ -2459,6 +2384,36 @@ msgstr "Registrarse"
 msgid "Forgot your password?"
 msgstr "¿Olvidaste tu contraseña?"
 
+#: templates/authopenid/confirm_email.txt:2
+msgid "Thank you for registering at our Q&A forum!"
+msgstr ""
+
+#: templates/authopenid/confirm_email.txt:4
+msgid "Your account details are:"
+msgstr ""
+
+#: templates/authopenid/confirm_email.txt:6
+#: templates/authopenid/sendpw_email.txt:7
+msgid "Username:"
+msgstr "Nombre de usuario:"
+
+#: templates/authopenid/confirm_email.txt:7
+#: templates/authopenid/delete.html:20
+msgid "Password:"
+msgstr "Contraseña"
+
+#: templates/authopenid/confirm_email.txt:9
+msgid "Please sign in here:"
+msgstr ""
+
+#: templates/authopenid/confirm_email.txt:12
+#: templates/authopenid/email_validation.txt:14
+#: templates/authopenid/sendpw_email.txt:13
+msgid ""
+"Sincerely,\n"
+"Forum Administrator"
+msgstr ""
+
 #: templates/authopenid/delete.html:9
 msgid "Account: delete account"
 msgstr "Cuenta: borrar cuenta"
@@ -2475,10 +2430,6 @@ msgstr ""
 msgid "Check confirm box, if you want delete your account."
 msgstr "Marca caja de confirmación, si deseas borrar tu cuenta."
 
-#: templates/authopenid/delete.html:20
-msgid "Password:"
-msgstr "Contraseña"
-
 #: templates/authopenid/delete.html:32
 msgid "I am sure I want to delete my account."
 msgstr "Estoy seguro que quiero borrar mi cuenta."
@@ -2495,6 +2446,25 @@ msgstr "(requerido por tu seguridad)"
 msgid "Delete account permanently"
 msgstr "Borrar la cuenta de forma permanente"
 
+#: templates/authopenid/email_validation.txt:2
+msgid "Greetings from the Q&A forum"
+msgstr ""
+
+#: templates/authopenid/email_validation.txt:4
+msgid "To make use of the Forum, please follow the link below:"
+msgstr ""
+
+#: templates/authopenid/email_validation.txt:8
+msgid "Following the link above will help us verify your email address."
+msgstr ""
+
+#: templates/authopenid/email_validation.txt:10
+msgid ""
+"If you beleive that this message was sent in mistake - \n"
+"no further action is needed. Just ingore this email, we apologize\n"
+"for any inconvenience"
+msgstr ""
+
 #: templates/authopenid/sendpw.html:4 templates/authopenid/sendpw.html.py:8
 msgid "Send new password"
 msgstr "Enviar nueva contraseña"
@@ -2531,6 +2501,26 @@ msgstr ""
 "Nota: tu nueva contraseña solo será activada luego de que hagas click en el "
 "link de activación en el email enviado."
 
+#: templates/authopenid/sendpw_email.txt:2
+#, python-format
+msgid ""
+"Someone has requested to reset your password on %(site_url)s.\n"
+"If it were not you, it is safe to ignore this email."
+msgstr ""
+
+#: templates/authopenid/sendpw_email.txt:5
+msgid "Your new account details are:"
+msgstr ""
+
+#: templates/authopenid/sendpw_email.txt:8
+#, fuzzy
+msgid "New password:"
+msgstr "Nueva contraseña:"
+
+#: templates/authopenid/sendpw_email.txt:10
+msgid "To confirm that you wanted to reset your password please visit:"
+msgstr ""
+
 #: templates/authopenid/settings.html:30
 msgid "Give your  account a new password."
 msgstr "Crea una nueva contraseña para tu cuenta."
@@ -2692,6 +2682,9 @@ msgstr "Registrate con tu OpenID"
 msgid "Login with your OpenID"
 msgstr "Ingresar con tu OpenID"
 
+#~ msgid "site title"
+#~ msgstr "Preguntalo.com.uy"
+
 #~ msgid "Have a total of"
 #~ msgstr "Hay un total de"
 
diff --git a/settings_local.py.dist b/settings_local.py.dist
index d6273070..48d7b567 100644
--- a/settings_local.py.dist
+++ b/settings_local.py.dist
@@ -44,4 +44,4 @@ EMAIL_UNIQUE = False
 APP_URL = 'http://server.com' #used by email notif system and RSS
 GOOGLE_SITEMAP_CODE = '55uGNnQVJW8p1bbXeF/Xbh9I7nZBM/wLhRz6N/I1kkA='
 GOOGLE_ANALYTICS_KEY = ''
-
+BOOKS_ON = True 
diff --git a/templates/404.html b/templates/404.html
index bfb86e7d..2fa38f99 100644
--- a/templates/404.html
+++ b/templates/404.html
@@ -27,7 +27,7 @@
         <ul>
             <li>{% trans "this question or answer has been deleted;" %}</li>
             <li>{% trans "url has error - please check it;" %}</li>
-            <li>{% trans "the page you tried to visit is protected or you don't have sufficient points, see" %} <a href="{% url faq %}"> faq</a>；</li>
+            <li>{% trans "the page you tried to visit is protected or you don't have sufficient points, see" %} <a href="{% url faq %}"> faq</a>;</li>
             <li>{% trans "if you believe this error 404 should not have occured, please" %} 
 				<a href="{{feedback_site_url}}" target="_blank">{% trans "report this problem" %}</a></li>
             </u>
@@ -38,9 +38,9 @@
         </script>
         <script type="text/javascript" src="http://linkhelp.clients.google.com/tbproxy/lh/wm/fixurl.js"></script>
         <ul>
-            <li><a href="#" id="linkPrevious">{% trans "back to previous page" %} » </li>
-            <li><a href="{% url questions %}">{% trans "see all questions" %} » </a></li>
-            <li><a href="{% url tags %}">{% trans "see all tags" %} » </a></li>
+            <li><a href="#" id="linkPrevious">{% trans "back to previous page" %} »</li>
+            <li><a href="{% url questions %}">{% trans "see all questions" %} »</a></li>
+            <li><a href="{% url tags %}">{% trans "see all tags" %} »</a></li>
         </u>
     </div>
 
diff --git a/templates/about.html b/templates/about.html
index 9a3e2101..eaf0d591 100644
--- a/templates/about.html
+++ b/templates/about.html
@@ -12,13 +12,10 @@
 </div>
 
 <div class="content">
-	<p>Preguntalo.com.uy es una herramienta social para hacer preguntas y recibir respuestas
-	de forma colectiva, incentivando a quienes aporten contenidos relevantes mediante un 
-	sistema de reputación.</p>
-	<p>Si haces una pregunta ques es votada por los usuarios como útil, recibiras
-	puntos de reputación, también si respondes una pregunta, y más puntos aún si tu respuesta
-	es aceptada como la correcta!</p>
-	<p>Si tenés alguna duda, no dudes en preguntalo! :)</p>
+	<p>edit file templates/about.html. Below are just suggestions of what can go here</p>
+	<p>what is your site for?</p>
+	<p>how does it work? what are roles of members?</p>
+	<p>is there a place to find out more about this website?</p>
 </div>
 {% endblock %}
 <!-- end template about.html -->
diff --git a/templates/content/images/logo.png b/templates/content/images/logo.png
index b5501337..640eb1da 100644
Binary files a/templates/content/images/logo.png and b/templates/content/images/logo.png differ
diff --git a/templates/content/images/originals/logo.svg b/templates/content/images/originals/logo.svg
deleted file mode 100644
index 29c53f60..00000000
--- a/templates/content/images/originals/logo.svg
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="200"
-   height="60"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="logo.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/bruno/repos/preguntalo/templates/content/images/logo.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <inkscape:perspective
-       id="perspective2390"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.979899"
-     inkscape:cx="130.73959"
-     inkscape:cy="39.353001"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1280"
-     inkscape:window-height="732"
-     inkscape:window-x="0"
-     inkscape:window-y="24" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-154.28572,-485.2193)">
-    <text
-       xml:space="preserve"
-       style="font-size:35.70877075px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:semi-condensed;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#008000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans Bold Semi-Condensed"
-       x="154.2048"
-       y="532.07758"
-       id="text2396"
-       sodipodi:linespacing="125%"
-       inkscape:export-filename="/home/bruno/repos/preguntalo/templates/content/images/text2424.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan2398"
-         x="154.2048"
-         y="532.07758">Preguntalo</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:12.09910297px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:semi-condensed;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#808080;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans Bold Semi-Condensed"
-       x="303.99615"
-       y="542.42242"
-       id="text2400"
-       sodipodi:linespacing="125%"
-       inkscape:export-filename="/home/bruno/repos/preguntalo/templates/content/images/text2424.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan2402"
-         x="303.99615"
-         y="542.42242"
-         style="font-size:12.09910297px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:semi-condensed;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#808080;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans Bold Semi-Condensed">.com.uy</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:10.5875988px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:semi-condensed;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans Bold Semi-Condensed"
-       x="157.2961"
-       y="502.24216"
-       id="text2424"
-       inkscape:export-filename="/home/bruno/repos/preguntalo/templates/content/images/text2424.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan2426"
-         x="157.2961"
-         y="502.24216">Si no lo sabes ¿?#*!...</tspan></text>
-  </g>
-</svg>
diff --git a/templates/content/style/style.css b/templates/content/style/style.css
index 1f992b7b..6d48198b 100644
--- a/templates/content/style/style.css
+++ b/templates/content/style/style.css
@@ -110,7 +110,7 @@ blockquote
 	margin-bottom:-3px;
 }
 #navBar {float:clear;position:relative;display:block;width:960px;}
-#navBar .nav {margin:50px 0px 0px 16px;
+#navBar .nav {margin:20px 0px 0px 16px;
 	/*letter-spacing:1px; */
 	}
 #navBar .nav a {color:#333333; background-color:#F9F7ED; 
@@ -118,14 +118,13 @@ blockquote
                 border-bottom: none;
 				padding:0px 12px 3px 12px; height:25px; line-height:30px;margin-left:10px; font-size:14px; font-weight:400; text-decoration:none;display: block;float: left;}
 #navBar .nav a:hover {text-decoration:underline}
-#navBar .nav a.on {height:24px;line-height:28px;border:1px solid green; background:green; color:#FFF; font-weight:600; text-decoration:none}
-#navBar .nav a.special {font-size:15px; color:green; font-weight:bold; text-decoration:none; border:solid 1px;}
+#navBar .nav a.on {height:24px;line-height:28px;border:1px solid #d64000; background:#B02B2C; color:#FFF; font-weight:600; text-decoration:none}
+#navBar .nav a.special {font-size:15px; color:#B02B2C; font-weight:bold; text-decoration:none; }
 #navBar .nav a.special:hover {text-decoration:underline;}
-#navBar .nav div.focus {position: absolute; top:10px;
- padding-right:0px;}
+#navBar .nav div.focus {float:right; padding-right:0px;}
 /*搜索栏*/
 #searchBar {
-    background-color:green;/*#e9b96e;*/
+    background-color:#9db2b1;/*#e9b96e;*/
     padding:5px 0 0 0;} /* #B02B2C */
 #searchBar .content { }
 #searchBar .searchInput {font-size:13px; height:18px; width:400px;}
@@ -746,7 +745,7 @@ background-color: #97ff97;
 }
 
 /*用户资料页面*/
-.count {font-family:Arial;font-size:200%;font-weight:700;color:#777}
+.count {font-family:Arial;font-size:24px;font-weight:700;color:#777}
 .scoreNumber{font-family:Arial;font-size:35px;font-weight:800;color:#777;line-height:40px;
 	/*letter-spacing:0px*/
 	}
diff --git a/templates/faq.html b/templates/faq.html
index ffbc2ed7..aec37a56 100644
--- a/templates/faq.html
+++ b/templates/faq.html
@@ -25,7 +25,7 @@
     
         <div>
             <h3 class="subtitle">{% trans "What should I avoid in my answers?" %}</h3>
-            <p>{% trans "site title" %} {% trans "is a Q&A site, not a discussion group. Therefore - please avoid having discussions in your answers, comment facility allows some space for brief discussions." %}</p>
+            <p>{{ settings.APP_TITLE }} {% trans "is a Q&A site, not a discussion group. Therefore - please avoid having discussions in your answers, comment facility allows some space for brief discussions." %}</p>
         </div>
     
         <div>
@@ -123,7 +123,7 @@
             <h3 class="subtitle">{% trans "Still have questions?" %}</h3>
             <p>{% trans "Please ask your question, help make our community better!" %} 
             <!--
-            <a href="{% url tags %}faq" class="big">{% trans "site title" %} {% trans "questions" %}</a>{% trans "." %}
+            <a href="{% url tags %}faq" class="big">{{ settings.APP_TITLE }} {% trans "questions" %}</a>{% trans "." %}
             -->
             </p>
         </div>
diff --git a/templates/header.html b/templates/header.html
index 077de586..e1097802 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -26,14 +26,12 @@
             	</td>
 				<td width="77%" valign="bottom">
                 <div class="nav">
-                    <div class="focus">
-                    <a id="nav_ask" href="{% url ask %}" class="special">{% trans "ask a question" %}</a>
-                    </div>
-
                     <a id="nav_questions" href="{% url questions %}" >{% trans "questions" %}</a>
                     <a id="nav_tags" href="{% url tags %}">{% trans "tags" %}</a>
                     <a id="nav_users" href="{% url users %}">{% trans "users" %}</a>
-                    <!--<a id="nav_books" href="{% url books %}">{% trans "books" %}</a>-->
+                    {% if settings.BOOKS_ON %}
+                    <a id="nav_books" href="{% url books %}">{% trans "books" %}</a>
+                    {% endif %}
                     <a id="nav_badges" href="{% url badges %}">{% trans "badges" %}</a>
                     <a id="nav_unanswered" href="{% url unanswered %}">{% trans "unanswered questions" %}</a>
                     
@@ -42,6 +40,9 @@
                     <a id="nav_profile" href="{% url user %}{{ request.user.id }}/{{ request.user.username }}/">{% trans "my profile" %}</a>
                     {% endif %}
 					{% endcomment %}
+                    <div class="focus">
+                    <a id="nav_ask" href="{% url ask %}" class="special">{% trans "ask a question" %}</a>
+                    </div>
                 </div>
 
               </td>
@@ -52,7 +53,7 @@
 			<table width="100%" border="0" cellpadding="0" cellspacing="0" class="content">
             <tr>
                 <td align="center" valign="middle">
-                    <form action="{% url search %}" method="GET">
+                    <form action="{% url search %}" method="get">
                         <div>
                             <input type="text" class="searchInput" value="{{ keywords }}" name="q" id="keywords" />
                             <input type="submit" name="Submit" value="{% trans "search" %}" class="searchBtn" />
diff --git a/templates/index.html b/templates/index.html
index b358c384..104b24d0 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -21,9 +21,9 @@
 <div class="tabBar">
     <div class="headQuestions">{% trans "Questions" %}</div>
     <div class="tabsA">
-    	 <a id="latest" href="?sort=latest" title="{% trans "last updated questions" %}" >{% trans "newest" %}</a>
-        <a id="hottest" href="?sort=hottest" title="{% trans "hottest questions" %}" >{% trans "hottest" %}</a>
-        <a id="mostvoted" href="?sort=mostvoted" title="{% trans "most voted questions" %}" >{% trans "most voted" %}</a>
+    	 <a id="latest" href="{% url questions %}?sort=latest" title="{% trans "last updated questions" %}" >{% trans "newest" %}</a>
+        <a id="hottest" href="{% url questions %}?sort=hottest" title="{% trans "hottest questions" %}" >{% trans "hottest" %}</a>
+        <a id="mostvoted" href="{% url questions %}?sort=mostvoted" title="{% trans "most voted questions" %}" >{% trans "most voted" %}</a>
         <a id="all" href="{% url questions %}" title="{% trans "all questions" %}" >{% trans "all questions" %}</a>
     </div>
 </div>
@@ -93,7 +93,7 @@
             <a rel="tag" 
 				title="{% blocktrans with tag.name as tagname %}see questions tagged '{{tagname}}'{% endblocktrans %}" href="{% url forum.views.tag tag.name|urlencode %}">{{ tag.name }}</a>
         {% endfor %}
-        </p>
+        </div>
         <div class="more"><a href="{% url tags %}">{% trans "popular tags" %} »</a> </div>
     </div>
 </div>
diff --git a/templates/question.html b/templates/question.html
index 0e1b8cb2..13d283ed 100644
--- a/templates/question.html
+++ b/templates/question.html
@@ -122,7 +122,7 @@
                             <div id="question-tags" class="tags" >
                                 {% for tag in question.tagname_list %}
                                     <a href="{% url forum.views.tag tag|urlencode %}" class="post-tag" 
-										title="{% trans "see questions tagged" %} '{{ tag }}' {% trans "using tags" %}" rel="tag">{{ tag }}</a>
+										title="{% blocktrans with tag as tagname %}see questions tagged '{{ tagname }}'{% endblocktrans %}" rel="tag">{{ tag }}</a>
                                 {% endfor %}
                             </div>
                             <div id="question-controls" style="clear:both;">
diff --git a/templates/user_stats.html b/templates/user_stats.html
index 7313fac3..07578cb7 100644
--- a/templates/user_stats.html
+++ b/templates/user_stats.html
@@ -7,85 +7,51 @@
 		{% block usercontent %}
 	
         <a name="questions"></a>
-        <table>
-            <tr>
-                <td>
-                    <div style="text-align: right;" class="count">{{questions|length}}</div>
-                </td>
-                <td>
-                    <h2>{% trans "User questions" %}</h2>
-                </td>
-            </tr>
-        </table>
+        <h2><span class="count">{{questions|length}}</span> {% trans "User questions" %}</h2>
 		{% include "users_questions.html" %}
-        <p>&nbsp;</p>
         <a name="answers"></a>
-        <table>
-            <tr>
-                <td>
-                    <div style="text-align: right;" class="count">{{answered_questions|length}}</div>
-                </td>
-                <td >
-                    <h2>{% trans "Answers" %}</h2>
-                </td>
-            </tr>
-        </table>
+        <h2><span class="count">{{answered_questions|length}}</span> {% trans "Answers" %}</h2>
         <div class="user-stats-table">
             {% for answered_question in answered_questions %}
             <div class="answer-summary">
-                <a title="{{answered_question.summary}}" href="{% url questions %}{{answered_question.id}}/{{answered_question.title}}#{{answered_question.answer_id}}">
-                    <div class="answer-votes {% if answered_question.accepted %}answered-accepted{% endif %}" 
-						title="{% blocktrans with answered_question.vote_count as vote_count %}the answer has been voted for {{ vote_count }} times{% endblocktrans %}&#13;{% if answered_question.accepted %}{% trans "this answer has been selected as correct" %}{%endif%}">
+                <a title="{{answered_question.summary|collapse}}" 
+                    href="{% url questions %}{{answered_question.id}}/{{answered_question.title}}#{{answered_question.answer_id}}">
+                    <span class="answer-votes {% if answered_question.accepted %}answered-accepted{% endif %}" 
+						title="{% blocktrans with answered_question.vote_count as vote_count %}the answer has been voted for {{ vote_count }} times{% endblocktrans %} {% if answered_question.accepted %}{% trans "this answer has been selected as correct" %}{%endif%}">
                         {{ answered_question.vote_count }}
-                    </div>
+                    </span>
                 </a>
                 <div class="answer-link">
-                    <a href="{% url questions %}{{answered_question.id}}/{{answered_question.title}}#{{answered_question.answer_id}}">{{answered_question.title}}</a> {% if answered_question.comment_count %}<span 
-					title="{% blocktrans with answered_question.comment_count as comment_count %}the answer has been commented {{ comment_count }} times{% endblocktrans %}">({{answered_question.comment_count}})</span>{% endif %}
+                    <a href="{% url questions %}{{answered_question.id}}/{{answered_question.title}}#{{answered_question.answer_id}}">{{answered_question.title}}</a> 
+                    {% if answered_question.comment_count %}
+                    <span>
+				    {% blocktrans with answered_question.comment_count as comment_count %}the answer has been commented {{ comment_count }} times{% endblocktrans %}
+                    </span> 
+                    {% endif %}
                 </div>
             </div>
             {% endfor %}
         </div>
-        <p>&nbsp;</p>
         <a name="votes"></a>
-        <table>
-            <tr>
-                <td>
-                    <div style="text-align: right;" class="count">{{total_votes}}</div>
-                </td>
-                <td >
-                    <h2>{% trans "votes total" %}</h2>                    
-                </td>
-            </tr>
-        </table>
+        <h2><span class="count">{{total_votes}}</span> {% trans "Votes" %}</h2>
         <div class="user-stats-table">
-            <table height="50px">
+            <table>
                 <tr>
                     <td width="60">
-                        <img style="cursor: default;" align="absmiddle" src="/content/images/vote-arrow-up-on.png"/>
+                        <img style="cursor: default;" src="/content/images/vote-arrow-up-on.png" alt="{% trans "thumb up" %}" />
                             <span title="{% trans "user has voted up this many times" %}" class="vote-count">{{up_votes}}</span>
 
                     </td>
                     <td width="60">
-                        <img style="cursor: default;" align="absmiddle" src="/content/images/vote-arrow-down-on.png"/>
+                        <img style="cursor: default;" src="/content/images/vote-arrow-down-on.png" alt="{% trans "thumb down" %}" />
                             <span title="{% trans "user voted down this many times" %}" class="vote-count">{{down_votes}}</span>
 
                     </td>
                 </tr>
             </table>
         </div>
-        <p>&nbsp;</p>
         <a name="tags"></a>
-        <table>
-            <tr>
-                <td>
-                    <div style="text-align: right;" class="count">{{tags|length}}</div>
-                </td>
-                <td >
-                    <h2>{% trans "Tags" %}</h2>
-                </td>
-            </tr>
-        </table>
+        <h2><span class="count">{{tags|length}}</span> {% trans "Tags" %}</h2>
         <div class="user-stats-table">
             <table class="tags">
                 <tr>
@@ -103,24 +69,14 @@
                 </tr>
             </table>
         </div>
-        <p>&nbsp;</p>
         <a name="badges"></a>
-        <table>
-            <tr>
-                <td>
-                    <div style="text-align: right;" class="count">{{total_awards}}</div>
-                </td>
-                <td >
-                    <h2>{% trans "Badges" %}</h2>
-                </td>
-            </tr>
-        </table>
+        <h2><span class="count">{{total_awards}}</span> {% trans "Badges" %}</h2>
         <div class="user-stats-table">
             <table>
                 <tr>
                     <td width="180" style="line-height:35px">
                         {% for award in awards %}
-                            <a href="{% url badges %}{{award.id}}/{{award.name}}" title="{{ award.description }}" class="medal"><span class="badge{{ award.type }}">&#9679;</span>&nbsp;{{ award.name }}</a><span class="tag-number"> × {{ award.count|intcomma }}</span><br/>
+                            <a href="{% url badges %}{{award.id}}/{{award.name}}" title="{{ award.description }}" class="medal"><span class="badge{{ award.type }}">&#9679;</span>&nbsp;{{ award.name }}</a><span class="tag-number"> &#x2715; {{ award.count|intcomma }}</span><br/>
                             {% if forloop.counter|divisibleby:"6" %}
                                 </td>
                                 <td width="180" style="line-height:35px">
diff --git a/templates/user_tabs.html b/templates/user_tabs.html
index 96cc5aca..cb7e1d2f 100644
--- a/templates/user_tabs.html
+++ b/templates/user_tabs.html
@@ -20,7 +20,7 @@
 			title="{% trans "user vote record" %}" href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=votes">{% trans "casted votes" %}</a>
         {% endif %}
         <a id="favorites" {% ifequal tab_name "favorites" %}class="on"{% endifequal %} 
-			title="{% trans "questions that user selected as his/her favorite" 
+			title="{% trans "questions that user selected as his/her favorite" %}"
 			href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=favorites">{% trans "favorites" %}</a>
         {% if request.user|can_view_user_preferences:view_user %}
         <a id="preferences" {% ifequal tab_name "preferences" %}class="on"{% endifequal %} 
diff --git a/templates/users_questions.html b/templates/users_questions.html
index dd818ddb..9907885e 100644
--- a/templates/users_questions.html
+++ b/templates/users_questions.html
@@ -9,13 +9,15 @@
             {% if question.favorited_myself %}
                 <div class="favorites-count">
                     <img title="{% trans "this questions was selected as favorite" %} {{question.favourite_count}} {% trans "number of times" %}" 
-						src="/content/images/vote-favorite-on.png">
+                        alt="{% trans "thumb-up on" %}"
+						src="/content/images/vote-favorite-on.png"/>
                     <div><b>{{question.favourite_count|intcomma}}</b></div>
                 </div>
             {% else %}
                 <div class="favorites-count-off">
                     <img title="{% trans "this question was selected as favorite" %}{{question.favourite_count}} {% trans "number of times" %}" 
-						src="/content/images/vote-favorite-off.png">
+                        alt="{% trans "thumb-up off" %}"
+						src="/content/images/vote-favorite-off.png"/>
                     <div><b>{{question.favourite_count|intcomma}}</b></div>
                 </div>
             {% endif %}
@@ -24,22 +26,22 @@
         {% endif %}
     <div id="question-summary-{{question.id}}" class="question-summary narrow">
         <a style="text-decoration: none;" href="{% url questions %}{{question.id}}/{{question.get_question_title}}">
-            <div class="stats">
-                <div class="votes">
-                    <div class="vote-count-post">{{question.vote_count|intcomma}}</div> 
+            <span class="stats">
+                <span class="votes">
+                    <span class="vote-count-post">{{question.vote_count|intcomma}}</span> 
                     {% trans "votes" %}
                   
-                </div>
-                <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>
+                </span>
+                <span 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 %}">
+                    <span class="answer-count-post">{{question.answer_count|intcomma}}</span>
                     {% trans "answers" %}
              
-                </div>
-                <div class="views">
-                     <div class="views-count-post">{{question.view_count|cnprog_intword|safe}}</div>
+                </span>
+                <span class="views">
+                     <span class="views-count-post">{{question.view_count|cnprog_intword|safe}}</span>
 					 {% trans "views" %}
-                </div>
-            </div>
+                </span>
+            </span>
         </a>
         <div class="summary">
             <h3>
@@ -60,7 +62,7 @@
             </div>
         </div>
     </div>
-    <br clear="both"/>
+    <br clear="all"/>
     {% endfor %}
 </div>
 <!-- end users_questions.html -->
-- 
cgit v1.2.3-1-g7c22