better comments, email subscriptions, corrected view counter, some ie7 issues, wiki optional with settings.WIKI_ON, site can be mounted on arbitrary url prefix, english language improvements, added feedback form, versioned css and js files to force browser cache reload when settings.RESOURCE_REVISION is incremented , other fixes

4 files changed, 1550 insertions, 1014 deletions

diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index cd8de560..502c1075 100644
--- a/locale/en/LC_MESSAGES/django.mo
+++ b/locale/en/LC_MESSAGES/django.mo
diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index b5e5c549..18eb61b1 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-19 00:41+0000\n"
+"POT-Creation-Date: 2009-11-10 19:00-0800\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,339 +16,315 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: settings.py:12 urls.py:25 forum/views.py:305 forum/views.py:699
-msgid "account/"
-msgstr ""
-
-#: 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:305 forum/views.py:700
-#: 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 ""
+#: django_authopenid/forms.py:70
+msgid "choose a username"
+msgstr "Choose screen name"
 
-#: urls.py:32
-msgid "privacy/"
+#: django_authopenid/forms.py:76
+msgid "user name is required"
 msgstr ""
 
-#: urls.py:33
-msgid "logout/"
+#: django_authopenid/forms.py:77
+msgid "sorry, this name is taken, please choose another"
 msgstr ""
 
-#: urls.py:34 urls.py:35 urls.py:36 urls.py:48 forum/models.py:418
-msgid "answers/"
+#: django_authopenid/forms.py:78
+msgid "sorry, this name is not allowed, please choose another"
 msgstr ""
 
-#: urls.py:34 urls.py:46
-msgid "comments/"
+#: django_authopenid/forms.py:79
+msgid "sorry, there is no user with this name"
 msgstr ""
 
-#: urls.py:35 urls.py:40 urls.py:54 templates/user_info.html:34
-msgid "edit/"
+#: django_authopenid/forms.py:80
+msgid "sorry, we have a serious error - user name is taken by several users"
 msgstr ""
 
-#: urls.py:36 urls.py:45
-msgid "revisions/"
+#: django_authopenid/forms.py:81
+msgid "user name can only consist of letters, empty space and underscore"
 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:1188 forum/views.py:1190
-#: forum/views.py:1430
-msgid "questions/"
-msgstr ""
+#: django_authopenid/forms.py:116
+msgid "your email address"
+msgstr "Your email <i>(never shared)</i>"
 
-#: urls.py:38 urls.py:64
-msgid "ask/"
+#: django_authopenid/forms.py:117
+msgid "email address is required"
 msgstr ""
 
-#: urls.py:39
-msgid "unanswered/"
+#: django_authopenid/forms.py:118
+msgid "please enter a valid email address"
 msgstr ""
 
-#: urls.py:41
-msgid "close/"
+#: django_authopenid/forms.py:119
+msgid "this email is already used by someone else, please choose another"
 msgstr ""
 
-#: urls.py:42
-msgid "reopen/"
+#: django_authopenid/forms.py:163 django_authopenid/views.py:117
+msgid "i-names are not supported"
 msgstr ""
 
-#: urls.py:43
-msgid "answer/"
+#: django_authopenid/forms.py:239
+msgid "Please enter valid username and password (both are case-sensitive)."
 msgstr ""
 
-#: urls.py:44
-msgid "vote/"
+#: django_authopenid/forms.py:242 django_authopenid/forms.py:292
+msgid "This account is inactive."
 msgstr ""
 
-#: urls.py:47 urls.py:48 django_authopenid/urls.py:29
-msgid "delete/"
+#: django_authopenid/forms.py:244
+msgid "Login failed."
 msgstr ""
 
-#: urls.py:50
-msgid "question/"
+#: django_authopenid/forms.py:246
+msgid "Please enter username and password"
 msgstr ""
 
-#: urls.py:51 urls.py:52 forum/views.py:741 forum/views.py:2027
-msgid "tags/"
+#: django_authopenid/forms.py:248
+msgid "Please enter your password"
 msgstr ""
 
-#: urls.py:53 urls.py:54 urls.py:55 forum/views.py:994 forum/views.py:998
-#: forum/views.py:1432 forum/views.py:1765 forum/views.py:2029
-msgid "users/"
+#: django_authopenid/forms.py:250
+msgid "Please enter user name"
 msgstr ""
 
-#: urls.py:56 urls.py:57
-msgid "badges/"
+#: django_authopenid/forms.py:288
+msgid ""
+"Please enter a valid                     username and password. Note that "
+"both fields are                     case-sensitive."
 msgstr ""
 
-#: urls.py:58
-msgid "messages/"
-msgstr ""
+#: django_authopenid/forms.py:310
+msgid "choose password"
+msgstr "Password"
 
-#: urls.py:58
-msgid "markread/"
+#: django_authopenid/forms.py:311
+msgid "password is required"
 msgstr ""
 
-#: urls.py:60
-msgid "nimda/"
-msgstr ""
+#: django_authopenid/forms.py:314
+msgid "retype password"
+msgstr "Password <i>(please retype)</i>"
 
-#: urls.py:62
-msgid "upload/"
+#: django_authopenid/forms.py:315
+msgid "please, retype your password"
 msgstr ""
 
-#: urls.py:63 urls.py:64 urls.py:65
-msgid "books/"
+#: django_authopenid/forms.py:316
+msgid "sorry, entered passwords did not match, please try again"
 msgstr ""
 
-#: urls.py:66
-msgid "search/"
+#: django_authopenid/forms.py:341
+msgid "Current password"
 msgstr ""
 
-#: django_authopenid/forms.py:67 django_authopenid/views.py:102
-msgid "i-names are not supported"
+#: django_authopenid/forms.py:343
+msgid "New password"
 msgstr ""
 
-#: django_authopenid/forms.py:102
-msgid ""
-"Usernames can only contain                     letters, numbers and "
-"underscores"
+#: django_authopenid/forms.py:345
+msgid "Retype new password"
 msgstr ""
 
-#: django_authopenid/forms.py:109
+#: django_authopenid/forms.py:356
 msgid ""
-"This username does not exist                     in our database. Please "
-"choose another."
+"Old password is incorrect.                     Please enter the correct "
+"password."
 msgstr ""
 
-#: django_authopenid/forms.py:126 django_authopenid/forms.py:233
-msgid ""
-"Please enter a valid                     username and password. Note that "
-"both fields are                     case-sensitive."
+#: django_authopenid/forms.py:368
+msgid "new passwords do not match"
 msgstr ""
 
-#: django_authopenid/forms.py:130 django_authopenid/forms.py:237
-msgid "This account is inactive."
+#: django_authopenid/forms.py:432
+msgid "Your user name (<i>required</i>)"
 msgstr ""
 
-#: django_authopenid/forms.py:158 django_authopenid/forms.py:210
-msgid "invalid user name"
-msgstr "User names can contain letters, underscore and empty space."
-
-#: django_authopenid/forms.py:160
-msgid "sorry, this name can not be used, please try another"
-msgstr ""
+#: django_authopenid/forms.py:447
+msgid "Incorrect username."
+msgstr "sorry, there is no such user name"
 
-#: django_authopenid/forms.py:162
-msgid "username too short"
+#: django_authopenid/urls.py:9 django_authopenid/urls.py:10
+#: django_authopenid/urls.py:11 django_authopenid/urls.py:13 forum/urls.py:24
+msgid "signin/"
 msgstr ""
 
-#: django_authopenid/forms.py:170 django_authopenid/forms.py:171
-msgid "this name is already in use - please try anoter"
+#: django_authopenid/urls.py:10
+msgid "newquestion/"
 msgstr ""
 
-#: django_authopenid/forms.py:185
-msgid ""
-"This email is already                         registered in our database. "
-"Please choose another."
+#: django_authopenid/urls.py:11
+msgid "newanswer/"
 msgstr ""
 
-#: django_authopenid/forms.py:216
-msgid ""
-"This username don't exist.                         Please choose another."
+#: django_authopenid/urls.py:12
+msgid "signout/"
 msgstr ""
 
-#: django_authopenid/forms.py:255
-msgid "choose a username"
+#: django_authopenid/urls.py:13
+msgid "complete/"
 msgstr ""
 
-#: django_authopenid/forms.py:257 templates/authopenid/signup.html:38
-msgid "your email address"
-msgstr ""
+#: django_authopenid/urls.py:15
+msgid "external-login/"
+msgstr "using-nmr-wiki-login-and-password/"
 
-#: django_authopenid/forms.py:259 templates/authopenid/signup.html:39
-msgid "choose password"
+#: django_authopenid/urls.py:16
+msgid "register/"
 msgstr ""
 
-#: django_authopenid/forms.py:261 templates/authopenid/signup.html:40
-msgid "retype password"
+#: django_authopenid/urls.py:17
+msgid "signup/"
 msgstr ""
 
-#: django_authopenid/forms.py:335
-msgid ""
-"Old password is incorrect.                     Please enter the correct "
-"password."
+#: django_authopenid/urls.py:19
+msgid "sendpw/"
 msgstr ""
 
-#: django_authopenid/forms.py:347
-msgid "new passwords do not match"
+#: django_authopenid/urls.py:20 django_authopenid/urls.py:24
+msgid "password/"
 msgstr ""
 
-#: django_authopenid/forms.py:442
-msgid "Incorrect username."
+#: django_authopenid/urls.py:20
+msgid "confirm/"
 msgstr ""
 
-#: django_authopenid/urls.py:10 forum/views.py:305 forum/views.py:700
-msgid "newquestion/"
+#: django_authopenid/urls.py:23
+msgid "account_settings"
 msgstr ""
 
-#: django_authopenid/urls.py:11
-msgid "newanswer/"
+#: django_authopenid/urls.py:25 django_authopenid/urls.py:26
+#: django_authopenid/urls.py:27 django_authopenid/urls.py:28
+msgid "email/"
 msgstr ""
 
-#: django_authopenid/urls.py:12
-msgid "signout/"
+#: django_authopenid/urls.py:25
+msgid "validate/"
 msgstr ""
 
-#: django_authopenid/urls.py:13
-msgid "complete/"
+#: django_authopenid/urls.py:26
+msgid "change/"
 msgstr ""
 
-#: django_authopenid/urls.py:15
-msgid "register/"
+#: django_authopenid/urls.py:27
+msgid "sendkey/"
 msgstr ""
 
-#: django_authopenid/urls.py:16
-msgid "signup/"
+#: django_authopenid/urls.py:28
+msgid "verify/"
 msgstr ""
 
-#: django_authopenid/urls.py:18
-msgid "sendpw/"
+#: django_authopenid/urls.py:29
+msgid "openid/"
 msgstr ""
 
-#: django_authopenid/urls.py:27
-msgid "validate/"
+#: django_authopenid/urls.py:30 forum/urls.py:43 forum/urls.py:47
+msgid "delete/"
 msgstr ""
 
-#: django_authopenid/views.py:108
+#: django_authopenid/views.py:123
 #, python-format
 msgid "OpenID %(openid_url)s is invalid"
 msgstr ""
 
-#: django_authopenid/views.py:418 django_authopenid/views.py:545
-msgid "Welcome"
-msgstr "Verification Email from Q&amp;A forum"
+#: django_authopenid/views.py:531
+msgid "Welcome email subject line"
+msgstr "Welcome to the Q&A forum"
 
-#: django_authopenid/views.py:508
+#: django_authopenid/views.py:626
 msgid "Password changed."
 msgstr ""
 
-#: django_authopenid/views.py:520 django_authopenid/views.py:525
-msgid "your email needs to be validated"
+#: django_authopenid/views.py:638 django_authopenid/views.py:644
+#, python-format
+msgid "your email needs to be validated see %(details_url)s"
 msgstr ""
 "Your email needs to be validated. Please see details <a "
-"id='validate_email_alert' href=\"/faq#validate\">here</a>."
+"id='validate_email_alert' href='%(details_url)s'>here</a>."
+
+#: django_authopenid/views.py:665
+msgid "Email verification subject line"
+msgstr "Verification Email from Q&A forum"
 
-#: django_authopenid/views.py:682 django_authopenid/views.py:834
+#: django_authopenid/views.py:751
+msgid "your email was not changed"
+msgstr ""
+
+#: django_authopenid/views.py:798 django_authopenid/views.py:950
 #, python-format
 msgid "No OpenID %s found associated in our database"
 msgstr ""
 
-#: django_authopenid/views.py:686 django_authopenid/views.py:841
+#: django_authopenid/views.py:802 django_authopenid/views.py:957
 #, python-format
 msgid "The OpenID %s isn't associated to current user logged in"
 msgstr ""
 
-#: django_authopenid/views.py:694
+#: django_authopenid/views.py:810
 msgid "Email Changed."
 msgstr ""
 
-#: django_authopenid/views.py:769
+#: django_authopenid/views.py:885
 msgid "This OpenID is already associated with another account."
 msgstr ""
 
-#: django_authopenid/views.py:774
+#: django_authopenid/views.py:890
 #, python-format
 msgid "OpenID %s is now associated with your account."
 msgstr ""
 
-#: django_authopenid/views.py:844
+#: django_authopenid/views.py:960
 msgid "Account deleted."
 msgstr ""
 
-#: django_authopenid/views.py:884
+#: django_authopenid/views.py:1003
 msgid "Request for new password"
 msgstr ""
 
-#: django_authopenid/views.py:897
-msgid "A new password has been sent to your email address."
+#: django_authopenid/views.py:1016
+msgid "A new password and the activation link were sent to your email address."
 msgstr ""
 
-#: django_authopenid/views.py:927
+#: django_authopenid/views.py:1046
 #, python-format
 msgid ""
 "Could not change password. Confirmation key '%s'                is not "
 "registered."
 msgstr ""
 
-#: django_authopenid/views.py:936
+#: django_authopenid/views.py:1055
 msgid ""
 "Can not change password. User don't exist anymore                 in our "
 "database."
 msgstr ""
 
-#: django_authopenid/views.py:945
+#: django_authopenid/views.py:1064
 #, python-format
 msgid "Password changed for %s. You may now sign in."
 msgstr ""
 
+#: forum/auth.py:484
+msgid "Your question and all of it's answers have been deleted"
+msgstr ""
+
+#: forum/auth.py:486
+msgid "Your question has been deleted"
+msgstr ""
+
+#: forum/auth.py:489
+msgid "The question and all of it's answers have been deleted"
+msgstr ""
+
+#: forum/auth.py:491
+msgid "The question has been deleted"
+msgstr ""
+
 #: forum/const.py:8
 msgid "duplicate question"
 msgstr ""
 
 #: forum/const.py:9
-msgid "question if off-topic or not relevant"
+msgid "question is off-topic or not relevant"
 msgstr ""
 
 #: forum/const.py:10
@@ -467,151 +443,336 @@ msgstr ""
 msgid "latest questions"
 msgstr ""
 
-#: 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
+#: forum/feed.py:19 forum/urls.py:32 forum/urls.py:33 forum/urls.py:34
+#: forum/urls.py:35 forum/urls.py:36 forum/urls.py:37 forum/urls.py:38
+#: forum/urls.py:39 forum/urls.py:40 forum/urls.py:41 forum/urls.py:43
+msgid "questions/"
+msgstr ""
+
+#: forum/forms.py:16 templates/answer_edit_tips.html:35
+#: templates/answer_edit_tips.html.py:39 templates/question_edit_tips.html:32
+#: templates/question_edit_tips.html:37
 msgid "title"
 msgstr ""
 
-#: forum/forms.py:15
+#: forum/forms.py:17
 msgid "please enter a descriptive title for your question"
 msgstr ""
 
-#: forum/forms.py:20
+#: forum/forms.py:22
 msgid "title must be > 10 characters"
 msgstr ""
 
-#: forum/forms.py:29
+#: forum/forms.py:31
 msgid "content"
 msgstr ""
 
-#: forum/forms.py:35
+#: forum/forms.py:37
 msgid "question content must be > 10 characters"
 msgstr ""
 
-#: forum/forms.py:45 templates/header.html:30 templates/header.html.py:64
+#: forum/forms.py:47 templates/header.html:29 templates/header.html.py:63
 msgid "tags"
 msgstr ""
 
-#: forum/forms.py:47
+#: forum/forms.py:49
 msgid ""
 "Tags are short keywords, with no spaces within. Up to five tags can be used."
 msgstr ""
 
-#: forum/forms.py:54 templates/question_retag.html:38
+#: forum/forms.py:56 templates/question_retag.html:39
 msgid "tags are required"
 msgstr ""
 
-#: forum/forms.py:58
+#: forum/forms.py:62
 msgid "please use 5 tags or less"
 msgstr ""
 
-#: forum/forms.py:61
+#: forum/forms.py:65
 msgid "tags must be shorter than 20 characters"
 msgstr ""
 
-#: forum/forms.py:65
+#: forum/forms.py:69
 msgid ""
 "please use following characters in tags: letters 'a-z', numbers, and "
 "characters '.-_#'"
 msgstr ""
 
-#: 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
+#: forum/forms.py:79 templates/index.html:59 templates/index.html.py:71
+#: templates/post_contributor_info.html:7
+#: templates/question_summary_list_roll.html:26
+#: templates/question_summary_list_roll.html:38 templates/questions.html:59
+#: templates/questions.html.py:71 templates/unanswered.html:51
+#: templates/unanswered.html.py:63
 msgid "community wiki"
 msgstr ""
 
-#: forum/forms.py:76
+#: forum/forms.py:80
 msgid ""
 "if you choose community wiki option, the question and answer do not generate "
 "points and name of author will not be shown"
 msgstr ""
 
-#: forum/forms.py:89
+#: forum/forms.py:96
 msgid "update summary:"
 msgstr ""
 
-#: forum/forms.py:90
+#: forum/forms.py:97
 msgid ""
 "enter a brief summary of your revision (e.g. fixed spelling, grammar, "
 "improved style, this field is optional)"
 msgstr ""
 
-#: forum/forms.py:175
+#: forum/forms.py:100
+msgid "Automatically accept user's contributions for the email updates"
+msgstr ""
+
+#: forum/forms.py:113
+msgid "Your name:"
+msgstr ""
+
+#: forum/forms.py:114
+msgid "Email (not shared with anyone):"
+msgstr ""
+
+#: forum/forms.py:115
+msgid "Your message:"
+msgstr ""
+
+#: forum/forms.py:197
 msgid "this email does not have to be linked to gravatar"
 msgstr ""
 
-#: forum/forms.py:176
+#: forum/forms.py:198
 msgid "Real name"
 msgstr ""
 
-#: forum/forms.py:177
+#: forum/forms.py:199
 msgid "Website"
 msgstr ""
 
-#: forum/forms.py:178
+#: forum/forms.py:200
 msgid "Location"
 msgstr ""
 
-#: forum/forms.py:179
+#: forum/forms.py:201
 msgid "Date of birth"
 msgstr ""
 
-#: forum/forms.py:179
+#: forum/forms.py:201
 msgid "will not be shown, used to calculate age, format: YYYY-MM-DD"
 msgstr ""
 
-#: forum/forms.py:180 templates/authopenid/settings.html:21
+#: forum/forms.py:202 templates/authopenid/settings.html:21
 msgid "Profile"
 msgstr ""
 
-#: forum/forms.py:207 forum/forms.py:208
+#: forum/forms.py:229 forum/forms.py:230
 msgid "this email has already been registered, please use another one"
 msgstr ""
 
-#: forum/models.py:246
+#: forum/forms.py:234 forum/forms.py:235
+msgid "weekly"
+msgstr ""
+
+#: forum/forms.py:234 forum/forms.py:235
+msgid "no email"
+msgstr ""
+
+#: forum/forms.py:235
+msgid "daily"
+msgstr ""
+
+#: forum/forms.py:250 forum/models.py:46
+msgid "Entire forum"
+msgstr ""
+
+#: forum/forms.py:253
+msgid "Asked by me"
+msgstr ""
+
+#: forum/forms.py:256
+msgid "Answered by me"
+msgstr ""
+
+#: forum/forms.py:259
+msgid "Individually selected"
+msgstr ""
+
+#: forum/models.py:47
+msgid "Questions that I asked"
+msgstr ""
+
+#: forum/models.py:48
+msgid "Questions that I answered"
+msgstr ""
+
+#: forum/models.py:49
+msgid "Individually selected questions"
+msgstr ""
+
+#: forum/models.py:52
+msgid "Weekly"
+msgstr ""
+
+#: forum/models.py:53
+msgid "Daily"
+msgstr ""
+
+#: forum/models.py:54
+msgid "No email"
+msgstr ""
+
+#: forum/models.py:289
 #, python-format
 msgid "%(author)s modified the question"
 msgstr ""
 
-#: forum/models.py:250
+#: forum/models.py:293
 #, python-format
 msgid "%(people)s posted %(new_answer_count)s new answers"
 msgstr ""
 
-#: forum/models.py:255
+#: forum/models.py:298
 #, python-format
 msgid "%(people)s commented the question"
 msgstr ""
 
-#: forum/models.py:260
+#: forum/models.py:303
 #, python-format
 msgid "%(people)s commented answers"
 msgstr ""
 
-#: forum/models.py:262
+#: forum/models.py:305
 #, python-format
 msgid "%(people)s commented an answer"
 msgstr ""
 
-#: forum/models.py:306 forum/models.py:418
-msgid "revisions"
-msgstr ""
-
-#: forum/models.py:441 templates/badges.html:51
+#: forum/models.py:493 templates/badges.html:53
 msgid "gold"
 msgstr ""
 
-#: forum/models.py:442 templates/badges.html:59
+#: forum/models.py:494 templates/badges.html:61
 msgid "silver"
 msgstr ""
 
-#: forum/models.py:443 templates/badges.html:66
+#: forum/models.py:495 templates/badges.html:68
 msgid "bronze"
 msgstr ""
 
+#: forum/urls.py:21
+msgid "upfiles/"
+msgstr ""
+
+#: forum/urls.py:25
+msgid "about/"
+msgstr ""
+
+#: forum/urls.py:26
+msgid "faq/"
+msgstr ""
+
+#: forum/urls.py:27
+msgid "privacy/"
+msgstr ""
+
+#: forum/urls.py:28
+msgid "logout/"
+msgstr ""
+
+#: forum/urls.py:29 forum/urls.py:30 forum/urls.py:31 forum/urls.py:47
+msgid "answers/"
+msgstr ""
+
+#: forum/urls.py:29 forum/urls.py:41 forum/urls.py:43 forum/urls.py:47
+msgid "comments/"
+msgstr ""
+
+#: forum/urls.py:30 forum/urls.py:35 forum/urls.py:56
+#: templates/user_info.html:45
+msgid "edit/"
+msgstr ""
+
+#: forum/urls.py:31 forum/urls.py:40
+msgid "revisions/"
+msgstr ""
+
+#: forum/urls.py:33 forum/urls.py:66
+msgid "ask/"
+msgstr ""
+
+#: forum/urls.py:34
+msgid "unanswered/"
+msgstr ""
+
+#: forum/urls.py:36
+msgid "close/"
+msgstr ""
+
+#: forum/urls.py:37
+msgid "reopen/"
+msgstr ""
+
+#: forum/urls.py:38
+msgid "answer/"
+msgstr ""
+
+#: forum/urls.py:39
+msgid "vote/"
+msgstr ""
+
+#: forum/urls.py:51
+msgid "question/"
+msgstr ""
+
+#: forum/urls.py:52 forum/urls.py:53
+msgid "tags/"
+msgstr ""
+
+#: forum/urls.py:54 forum/urls.py:56 forum/urls.py:57
+msgid "users/"
+msgstr ""
+
+#: forum/urls.py:55
+msgid "moderate-user/"
+msgstr ""
+
+#: forum/urls.py:58 forum/urls.py:59
+msgid "badges/"
+msgstr ""
+
+#: forum/urls.py:60
+msgid "messages/"
+msgstr ""
+
+#: forum/urls.py:60
+msgid "markread/"
+msgstr ""
+
+#: forum/urls.py:62
+msgid "nimda/"
+msgstr ""
+
+#: forum/urls.py:64
+msgid "upload/"
+msgstr ""
+
+#: forum/urls.py:65 forum/urls.py:66 forum/urls.py:67
+msgid "books/"
+msgstr ""
+
+#: forum/urls.py:68
+msgid "search/"
+msgstr ""
+
+#: forum/urls.py:69
+msgid "feedback/"
+msgstr ""
+
+#: forum/urls.py:70
+msgid "account/"
+msgstr ""
+
 #: forum/user.py:16 templates/user_tabs.html:7
 msgid "overview"
 msgstr ""
@@ -648,17 +809,17 @@ msgstr ""
 msgid "profile - responses"
 msgstr ""
 
-#: forum/user.py:42 templates/user_info.html:23 templates/users.html:26
+#: forum/user.py:42 templates/user_info.html:22 templates/users.html:26
 msgid "reputation"
-msgstr ""
+msgstr "karma"
 
 #: forum/user.py:43
 msgid "user reputation in the community"
-msgstr ""
+msgstr "user karma"
 
 #: forum/user.py:44
 msgid "profile - user reputation"
-msgstr ""
+msgstr "Profile - User's Karma"
 
 #: forum/user.py:50
 msgid "favorite questions"
@@ -684,61 +845,130 @@ msgstr ""
 msgid "profile - votes"
 msgstr ""
 
-#: forum/user.py:68
-msgid "preferences"
+#: forum/user.py:68 templates/user_tabs.html:28
+msgid "email subscriptions"
 msgstr ""
 
 #: forum/user.py:69 templates/user_tabs.html:27
-msgid "user preference settings"
+msgid "email subscription settings"
 msgstr ""
 
 #: forum/user.py:70
-msgid "profile - user preferences"
+msgid "profile - email subscriptions"
+msgstr ""
+
+#: forum/views.py:126
+msgid "Q&A forum feedback"
+msgstr ""
+
+#: forum/views.py:127
+msgid "Thanks for the feedback!"
+msgstr ""
+
+#: forum/views.py:135
+msgid "We look forward to hearing your feedback! Please, give it next time :)"
 msgstr ""
 
-#: forum/views.py:948
+#: forum/views.py:1014
 #, python-format
-msgid "subscription saved, %(email)s needs validation"
+msgid "subscription saved, %(email)s needs validation, see %(details_url)s"
 msgstr ""
 "Your subscription is saved, but email address %(email)s needs to be "
-"validated, please see <a href='/faq#validate'>more details here</a>"
+"validated, please see <a href='%(details_url)s'>more details here</a>"
 
-#: forum/views.py:1874
-msgid "uploading images is limited to users with >60 reputation points"
+#: forum/views.py:1022
+msgid "email update frequency has been set to daily"
+msgstr ""
+
+#: forum/views.py:1826
+msgid "changes saved"
+msgstr ""
+
+#: forum/views.py:1832
+msgid "email updates canceled"
 msgstr ""
 
-#: forum/views.py:1876
+#: forum/views.py:1999
+msgid "uploading images is limited to users with >60 reputation points"
+msgstr "sorry, file uploading requires karma >60"
+
+#: forum/views.py:2001
 msgid "allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'"
 msgstr ""
 
-#: forum/views.py:1878
+#: forum/views.py:2003
 #, python-format
 msgid "maximum upload file size is %sK"
 msgstr ""
 
-#: forum/views.py:1880
+#: forum/views.py:2005
 #, python-format
 msgid ""
 "Error uploading file. Please contact the site administrator. Thank you. %s"
 msgstr ""
 
-#: forum/management/commands/send_email_alerts.py:35
-msgid "updates from website"
-msgstr "Q&amp;A forum update"
+#: forum/management/commands/send_email_alerts.py:71
+msgid "email update message subject"
+msgstr "news from Q&A forum"
 
-#: forum/templatetags/extra_tags.py:143 forum/templatetags/extra_tags.py:172
-#: templates/header.html:35
+#: forum/management/commands/send_email_alerts.py:72
+#, python-format
+msgid "%(name)s, this is an update message header for a question"
+msgid_plural "%(name)s, this is an update message header for %(num)d questions"
+msgstr[0] "<p>Dear %(name)s,</p></p>The following question has been updated on the Q&A forum:</p>"
+msgstr[1] "<p>Dear %(name)s,</p><p>The following %(num)d questions have been updated on the Q&A forum:</p>"
+
+#: forum/management/commands/send_email_alerts.py:81
+#, python-format
+msgid ""
+"go to %(link)s to change frequency of email updates or %(email)s "
+"administrator"
+msgstr ""
+"<p>Please remember that you can always <a href='%(link)s'>adjust</a> frequency of the "
+"email updates or turn them off entirely.<br/>If you believe that this message "
+"was sent in an error, please email about it the forum administrator at %(email)"
+"s.</p>"
+"<p>Sincerely,</p><p>Your friendly Q&A forum server.</p>"
+
+#: forum/templatetags/extra_tags.py:160 forum/templatetags/extra_tags.py:189
+#: templates/header.html:34
 msgid "badges"
 msgstr ""
 
-#: forum/templatetags/extra_tags.py:144 forum/templatetags/extra_tags.py:171
+#: forum/templatetags/extra_tags.py:161 forum/templatetags/extra_tags.py:188
 msgid "reputation points"
+msgstr "karma"
+
+#: forum/templatetags/extra_tags.py:244
+msgid "%b %d at %H:%M"
+msgstr ""
+
+#: forum/templatetags/extra_tags.py:246
+msgid "%b %d '%y at %H:%M"
 msgstr ""
 
-#: forum/templatetags/extra_tags.py:225
-msgid " ago"
+#: forum/templatetags/extra_tags.py:248
+msgid "2 days ago"
 msgstr ""
 
+#: forum/templatetags/extra_tags.py:250
+msgid "yesterday"
+msgstr ""
+
+#: forum/templatetags/extra_tags.py:252
+#, python-format
+msgid "%(hr)d hour ago"
+msgid_plural "%(hr)d hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: forum/templatetags/extra_tags.py:254
+#, python-format
+msgid "%(min)d min ago"
+msgid_plural "%(min)d mins ago"
+msgstr[0] ""
+msgstr[1] ""
+
 #: templates/404.html:24
 msgid "Sorry, could not find the page you requested."
 msgstr ""
@@ -805,55 +1035,55 @@ msgstr ""
 msgid "About"
 msgstr ""
 
-#: templates/answer_edit.html:4 templates/answer_edit.html.py:47
+#: templates/answer_edit.html:5 templates/answer_edit.html.py:48
 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:43
-#: templates/question.html.py:46 templates/question_edit.html:27
+#: templates/answer_edit.html:25 templates/answer_edit.html.py:28
+#: templates/ask.html:26 templates/ask.html.py:29 templates/question.html:45
+#: templates/question.html.py:48 templates/question_edit.html:28
 msgid "hide preview"
 msgstr ""
 
-#: templates/answer_edit.html:27 templates/ask.html:28
-#: templates/question.html:46 templates/question_edit.html:27
+#: templates/answer_edit.html:28 templates/ask.html:29
+#: templates/question.html:48 templates/question_edit.html:28
 msgid "show preview"
 msgstr ""
 
-#: templates/answer_edit.html:47 templates/question_edit.html:65
-#: templates/question_retag.html:52 templates/revisions_answer.html:36
+#: templates/answer_edit.html:48 templates/question_edit.html:66
+#: templates/question_retag.html:53 templates/revisions_answer.html:36
 #: templates/revisions_question.html:36
 msgid "back"
 msgstr ""
 
-#: templates/answer_edit.html:52 templates/question_edit.html:70
-#: templates/revisions_answer.html:47 templates/revisions_question.html:47
+#: templates/answer_edit.html:53 templates/question_edit.html:71
+#: templates/revisions_answer.html:50 templates/revisions_question.html:50
 msgid "revision"
 msgstr ""
 
-#: templates/answer_edit.html:55 templates/question_edit.html:74
+#: templates/answer_edit.html:56 templates/question_edit.html:75
 msgid "select revision"
 msgstr ""
 
-#: templates/answer_edit.html:62 templates/ask.html:94
-#: templates/question.html:467 templates/question_edit.html:91
+#: templates/answer_edit.html:63 templates/ask.html:97
+#: templates/question.html:434 templates/question_edit.html:92
 msgid "Toggle the real time Markdown editor preview"
 msgstr ""
 
-#: templates/answer_edit.html:62 templates/ask.html:94
-#: templates/question.html:467 templates/question_edit.html:91
+#: templates/answer_edit.html:63 templates/ask.html:97
+#: templates/question.html:435 templates/question_edit.html:92
 msgid "toggle preview"
 msgstr ""
 
-#: templates/answer_edit.html:71 templates/question_edit.html:115
-#: templates/question_retag.html:73
+#: templates/answer_edit.html:72 templates/question_edit.html:118
+#: templates/question_retag.html:74
 msgid "Save edit"
 msgstr ""
 
-#: 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
+#: templates/answer_edit.html:73 templates/close.html:29
+#: templates/feedback.html:50 templates/question_edit.html:119
+#: templates/question_retag.html:75 templates/reopen.html:30
+#: templates/user_edit.html:83 templates/authopenid/changeemail.html:40
 msgid "Cancel"
 msgstr ""
 
@@ -877,80 +1107,82 @@ msgstr ""
 msgid "be clear and concise"
 msgstr ""
 
-#: templates/answer_edit_tips.html:19 templates/question_edit_tips.html:16
+#: templates/answer_edit_tips.html:20 templates/question_edit_tips.html:17
 msgid "see frequently asked questions"
 msgstr ""
 
-#: templates/answer_edit_tips.html:24 templates/question_edit_tips.html:22
+#: templates/answer_edit_tips.html:26 templates/question_edit_tips.html:23
 msgid "Markdown tips"
 msgstr "Markdown basics"
 
-#: templates/answer_edit_tips.html:27 templates/question_edit_tips.html:25
+#: templates/answer_edit_tips.html:29 templates/question_edit_tips.html:26
 msgid "*italic* or __italic__"
 msgstr ""
 
-#: templates/answer_edit_tips.html:30 templates/question_edit_tips.html:28
+#: templates/answer_edit_tips.html:32 templates/question_edit_tips.html:29
 msgid "**bold** or __bold__"
 msgstr ""
 
-#: templates/answer_edit_tips.html:33 templates/question_edit_tips.html:31
+#: templates/answer_edit_tips.html:35 templates/question_edit_tips.html:32
 msgid "link"
 msgstr ""
 
-#: 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
+#: templates/answer_edit_tips.html:35 templates/answer_edit_tips.html.py:39
+#: templates/question_edit_tips.html:32 templates/question_edit_tips.html:37
 msgid "text"
 msgstr ""
 
-#: templates/answer_edit_tips.html:37 templates/question_edit_tips.html:36
+#: templates/answer_edit_tips.html:39 templates/question_edit_tips.html:37
 msgid "image"
 msgstr ""
 
-#: templates/answer_edit_tips.html:41 templates/question_edit_tips.html:40
+#: templates/answer_edit_tips.html:43 templates/question_edit_tips.html:41
 msgid "numbered list:"
 msgstr ""
 
-#: templates/answer_edit_tips.html:46 templates/question_edit_tips.html:45
+#: templates/answer_edit_tips.html:48 templates/question_edit_tips.html:46
 msgid "basic HTML tags are also supported"
 msgstr ""
 
-#: templates/answer_edit_tips.html:49 templates/question_edit_tips.html:48
+#: templates/answer_edit_tips.html:52 templates/question_edit_tips.html:50
 msgid "learn more about Markdown"
 msgstr ""
 
-#: templates/ask.html:4 templates/ask.html.py:60
+#: templates/ask.html:5 templates/ask.html.py:61
 msgid "Ask a question"
 msgstr ""
 
-#: templates/ask.html:67
+#: templates/ask.html:68
 msgid "login to post question info"
 msgstr ""
 "<span class=\"strong big\">You are welcome to start submitting your question "
-"anonymously</span>  - you are currently not logged in. When you post your "
-"question, you will be redirected to the login/signup page. Your question "
-"will be saved meanwhile  and will be posted when you log in. Login/signup "
-"process is very simple. Login takes about 30 seconds, initial signup takes a "
-"minute or less."
+"anonymously</span>. When you submit the post, you will be redirected to the "
+"login/signup page. Your question will be saved in the current session and "
+"will be published after you log in. Login/signup process is very simple. "
+"Login takes about 30 seconds, initial signup takes a minute or less."
 
-#: templates/ask.html:73
+#: templates/ask.html:74
 #, python-format
-msgid "must have valid %(email)s to post"
+msgid ""
+"must have valid %(email)s to post, \n"
+"                            see %(email_validation_faq_url)s\n"
+"                            "
 msgstr ""
 "<span class='strong big'>Looks like your email address, %(email)s has not "
 "yet been validated.</span> To post messages you must verify your email, "
-"please see <a href='/faq#validate'>more details here</a>.<br>You can submit "
-"your question now and validate email after that. Your question will saved as "
-"pending meanwhile. "
+"please see <a href='%(email_validation_faq_url)s'>more details here</a>."
+"<br>You can submit your question now and validate email after that. Your "
+"question will saved as pending meanwhile. "
 
-#: templates/ask.html:107
+#: templates/ask.html:112
 msgid "(required)"
 msgstr ""
 
-#: templates/ask.html:114
+#: templates/ask.html:119
 msgid "Login/signup to post your question"
 msgstr "Login/Signup to Post"
 
-#: templates/ask.html:116
+#: templates/ask.html:121
 msgid "Ask your question"
 msgstr "Ask Your Question"
 
@@ -966,7 +1198,7 @@ msgstr ""
 msgid "Badges summary"
 msgstr ""
 
-#: templates/badges.html:17 templates/user_stats.html:73
+#: templates/badges.html:17
 msgid "Badges"
 msgstr ""
 
@@ -977,38 +1209,41 @@ msgstr ""
 "Q&amp;A community will be recognized with the variety of badges."
 
 #: templates/badges.html:22
+#, python-format
 msgid ""
-"Below is the list of available badges and number of times each type of badge "
-"has been awarded."
+"Below is the list of available badges and number \n"
+"    of times each type of badge has been awarded. Give us feedback at %"
+"(feedback_faq_url)s.\n"
+"    "
 msgstr ""
 "Currently badges differ only by their level: <strong>gold</strong>, "
 "<strong>silver</strong> and <strong>bronze</strong> (their meanings are "
 "described on the right). In the future there will be many types of badges at "
-"each level. <strong>Please give us your <a href=\"/faq#feedback\">feedback</"
-"a></strong> - what kinds of badges would you like to see and suggest the "
-"activity for which those badges might be awarded."
+"each level. <strong>Please give us your <a href='%(feedback_faq_url)"
+"s'>feedback</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:48
+#: templates/badges.html:50
 msgid "Community badges"
 msgstr "Badge levels"
 
-#: templates/badges.html:54
+#: templates/badges.html:56
 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:62
+#: templates/badges.html:64
 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:65
+#: templates/badges.html:67
 msgid "bronze badge: often given as a special honor"
 msgstr ""
 
-#: templates/badges.html:69
+#: templates/badges.html:71
 msgid "bronze badge description"
 msgstr ""
 "If you are an active participant in this community, you will be recognized "
@@ -1080,8 +1315,9 @@ msgstr ""
 msgid "number of times"
 msgstr ""
 
-#: templates/book.html:105 templates/index.html:48 templates/questions.html:46
-#: templates/unanswered.html:37 templates/users_questions.html:32
+#: templates/book.html:105 templates/index.html:47
+#: templates/question_summary_list_roll.html:14 templates/questions.html:47
+#: templates/unanswered.html:39 templates/users_questions.html:32
 msgid "votes"
 msgstr ""
 
@@ -1089,15 +1325,17 @@ msgstr ""
 msgid "the answer has been accepted to be correct"
 msgstr ""
 
-#: templates/book.html:115 templates/index.html:49 templates/questions.html:47
-#: templates/unanswered.html:38 templates/users_questions.html:42
+#: templates/book.html:115 templates/index.html:48
+#: templates/question_summary_list_roll.html:15 templates/questions.html:48
+#: templates/unanswered.html:40 templates/users_questions.html:40
 msgid "views"
 msgstr ""
 
-#: 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:54
+#: templates/book.html:125 templates/index.html:103
+#: templates/question.html:480 templates/question_summary_list_roll.html:52
+#: templates/questions.html:103 templates/questions.html.py:171
+#: templates/tags.html:49 templates/unanswered.html:95
+#: templates/unanswered.html.py:122 templates/users_questions.html:52
 msgid "using tags"
 msgstr ""
 
@@ -1105,7 +1343,7 @@ msgstr ""
 msgid "subscribe to book RSS feed"
 msgstr ""
 
-#: templates/book.html:147 templates/index.html:118
+#: templates/book.html:147 templates/index.html:152
 msgid "subscribe to the questions feed"
 msgstr ""
 
@@ -1189,16 +1427,18 @@ msgid ""
 "The reputation system allows users earn the authorization to perform a "
 "variety of moderation tasks."
 msgstr ""
+"Karma system allows users to earn rights to perform a variety of moderation "
+"tasks"
 
 #: templates/faq.html:40
 msgid "How does reputation system work?"
-msgstr ""
+msgstr "How does karma system work?"
 
 #: templates/faq.html:41
 msgid "Rep system summary"
 msgstr ""
 "When a question or answer is upvoted, the user who posted them will gain "
-"some points, which are called \"reputation points\". These points serve as a "
+"some points, which are called \"karma points\". These points serve as a "
 "rough measure of the community trust to him/her. Various moderation tasks "
 "are gradually assigned to the users based on those points."
 
@@ -1237,51 +1477,53 @@ msgstr ""
 msgid "retag questions"
 msgstr ""
 
-#: templates/faq.html:77
+#: templates/faq.html:78
 msgid "edit community wiki questions"
 msgstr ""
 
-#: templates/faq.html:81
+#: templates/faq.html:83
 msgid "edit any answer"
 msgstr ""
 
-#: templates/faq.html:85
+#: templates/faq.html:87
 msgid "open any closed question"
 msgstr ""
 
-#: templates/faq.html:89
+#: templates/faq.html:91
 msgid "delete any comment"
 msgstr ""
 
-#: templates/faq.html:93
+#: templates/faq.html:95
 msgid "delete any questions and answers and perform other moderation tasks"
 msgstr ""
 
-#: templates/faq.html:100
+#: templates/faq.html:102
 msgid "how to validate email title"
 msgstr "How to validate email and why?"
 
-#: 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 "
-"<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 "
-"you can post messages</strong> on your behalf and to <strong>minimize spam</"
-"strong> posts.<br>With email you can <strong>subscribe for updates</strong> "
-"on the most interesting questions. Also, when you sign up for the first time "
-"- create a unique <a href='/faq#gravatar'><strong>gravatar</strong></a> "
-"personal image.</p>"
-
-#: templates/faq.html:106
+#: templates/faq.html:104
+#, python-format
+msgid ""
+"how to validate email info with %(send_email_key_url)s %(gravatar_faq_url)s"
+msgstr ""
+"<form style='margin:0;padding:0;' action='%(send_email_key_url)s'><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 <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 you can post messages</strong> on your behalf and to "
+"<strong>minimize spam</strong> posts.<br>With email you can "
+"<strong>subscribe for updates</strong> on the most interesting questions. "
+"Also, when you sign up for the first time - create a unique <a href='%"
+"(gravatar_faq_url)s'><strong>gravatar</strong></a> personal image.</p>"
+
+#: templates/faq.html:108
 msgid "what is gravatar"
 msgstr "What is gravatar?"
 
-#: templates/faq.html:107
+#: templates/faq.html:109
 msgid "gravatar faq info"
 msgstr ""
 "<strong>Gravatar</strong> means <strong>g</strong>lobally <strong>r</"
@@ -1292,63 +1534,124 @@ msgstr ""
 "your image</strong> at <a href='http://gravatar.com'><strong>gravatar.com</"
 "strong></a>"
 
-#: templates/faq.html:110
+#: templates/faq.html:112
 msgid "To register, do I need to create new password?"
 msgstr ""
 
-#: templates/faq.html:111
+#: templates/faq.html:113
 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:112
+#: templates/faq.html:114
 msgid "Login now!"
 msgstr ""
 
-#: templates/faq.html:117
+#: templates/faq.html:119
 msgid "Why other people can edit my questions/answers?"
 msgstr ""
 
-#: templates/faq.html:118
+#: templates/faq.html:120
 msgid "Goal of this site is..."
 msgstr ""
 
-#: templates/faq.html:118
+#: templates/faq.html:120
 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:119
+#: templates/faq.html:121
 msgid "If this approach is not for you, we respect your choice."
 msgstr ""
 
-#: templates/faq.html:123
+#: templates/faq.html:125
 msgid "Still have questions?"
 msgstr ""
 
-#: templates/faq.html:124
-msgid "Please ask your question, help make our community better!"
+#: templates/faq.html:126
+#, python-format
+msgid ""
+"Please ask your question at %(ask_question_url)s, help make our community "
+"better!"
 msgstr ""
-"Please <a href=\"/questions/ask\">ask</a> your question, help make our "
+"Please <a href='%(ask_question_url)s'>ask</a> your question, help make our "
 "community better!"
 
-#: templates/faq.html:126 templates/header.html:29 templates/header.html.py:63
+#: templates/faq.html:128 templates/header.html:28 templates/header.html.py:62
 msgid "questions"
 msgstr ""
 
-#: templates/faq.html:126 templates/index.html:123
+#: templates/faq.html:128 templates/index.html:157
 msgid "."
 msgstr ""
 
-#: templates/footer.html:8 templates/header.html:14 templates/index.html:83
+#: templates/feedback.html:6
+msgid "Feedback"
+msgstr ""
+
+#: templates/feedback.html:11
+msgid "Give us your feedback!"
+msgstr ""
+
+#: templates/feedback.html:17
+#, python-format
+msgid ""
+"\n"
+"            <span class='big strong'>Dear %(user_name)s</span>, we look "
+"forward to hearing your feedback. \n"
+"            Please type and send us your message below.\n"
+"            "
+msgstr ""
+
+#: templates/feedback.html:24
+msgid ""
+"\n"
+"            <span class='big strong'>Dear visitor</span>, we look forward to "
+"hearing your feedback.\n"
+"            Please type and send us your message below.\n"
+"            "
+msgstr ""
+
+#: templates/feedback.html:41
+msgid "(this field is required)"
+msgstr ""
+
+#: templates/feedback.html:49
+msgid "Send Feedback"
+msgstr ""
+
+#: templates/feedback_email.txt:3
+#, python-format
+msgid ""
+"\n"
+"Hello, this is a %(site_title)s forum feedback message\n"
+msgstr ""
+
+#: templates/feedback_email.txt:9
+msgid "Sender is"
+msgstr ""
+
+#: templates/feedback_email.txt:11 templates/feedback_email.txt.py:14
+msgid "email"
+msgstr ""
+
+#: templates/feedback_email.txt:13
+msgid "anonymous"
+msgstr ""
+
+#: templates/feedback_email.txt:19
+msgid "Message body:"
+msgstr ""
+
+#: templates/footer.html:8 templates/header.html:14 templates/index.html:117
 msgid "about"
 msgstr ""
 
-#: templates/footer.html:9 templates/header.html:15 templates/index.html:84
-#: templates/question_edit_tips.html:16
+#: templates/footer.html:9 templates/header.html:15 templates/index.html:118
+#: templates/question_edit_tips.html:17
 msgid "faq"
 msgstr ""
 
@@ -1368,162 +1671,176 @@ msgstr ""
 msgid "privacy policy"
 msgstr ""
 
-#: templates/footer.html:14
+#: templates/footer.html:22
 msgid "give feedback"
 msgstr ""
 
-#: templates/header.html:10
+#: templates/header.html:9
 msgid "logout"
 msgstr ""
 
-#: templates/header.html:12 templates/authopenid/signup.html:41
+#: templates/header.html:11
 msgid "login"
 msgstr ""
 
-#: templates/header.html:23
+#: templates/header.html:22
 msgid "back to home page"
 msgstr ""
 
-#: templates/header.html:31 templates/header.html.py:65
+#: templates/header.html:30 templates/header.html.py:64
 msgid "users"
 msgstr ""
 
-#: templates/header.html:33
+#: templates/header.html:32
 msgid "books"
 msgstr ""
 
-#: templates/header.html:36
+#: templates/header.html:35
 msgid "unanswered questions"
 msgstr "unanswered"
 
-#: templates/header.html:40
+#: templates/header.html:39
 msgid "my profile"
 msgstr ""
 
-#: templates/header.html:44
+#: templates/header.html:43
 msgid "ask a question"
 msgstr ""
 
-#: templates/header.html:59
+#: templates/header.html:58
 msgid "search"
 msgstr ""
 
-#: templates/index.html:7
+#: templates/index.html:8
 msgid "Home"
 msgstr ""
 
-#: templates/index.html:22 templates/questions.html:7
+#: templates/index.html:23 templates/questions.html:8
 msgid "Questions"
 msgstr ""
 
-#: templates/index.html:24
+#: templates/index.html:25
 msgid "last updated questions"
 msgstr ""
 
-#: templates/index.html:24 templates/questions.html:25
-#: templates/unanswered.html:20
+#: templates/index.html:25 templates/questions.html:26
+#: templates/unanswered.html:21
 msgid "newest"
 msgstr ""
 
-#: templates/index.html:25 templates/questions.html:27
+#: templates/index.html:26 templates/questions.html:28
 msgid "hottest questions"
 msgstr ""
 
-#: templates/index.html:25 templates/questions.html:27
+#: templates/index.html:26 templates/questions.html:28
 msgid "hottest"
 msgstr ""
 
-#: templates/index.html:26 templates/questions.html:28
+#: templates/index.html:27 templates/questions.html:29
 msgid "most voted questions"
 msgstr ""
 
-#: templates/index.html:26 templates/questions.html:28
+#: templates/index.html:27 templates/questions.html:29
 msgid "most voted"
 msgstr ""
 
-#: templates/index.html:27
+#: templates/index.html:28
 msgid "all questions"
 msgstr ""
 
-#: templates/index.html:47 templates/questions.html:45
-#: templates/unanswered.html:36 templates/users_questions.html:35
+#: templates/index.html:46 templates/question_summary_list_roll.html:13
+#: templates/questions.html:46 templates/unanswered.html:38
+#: templates/users_questions.html:36
 msgid "answers"
 msgstr ""
 
-#: 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
+#: templates/index.html:78 templates/index.html.py:92
+#: templates/questions.html:78 templates/questions.html.py:92
+#: templates/unanswered.html:70 templates/unanswered.html.py:84
+msgid "Posted:"
+msgstr ""
+
+#: templates/index.html:81 templates/index.html.py:86
+#: templates/questions.html:81 templates/questions.html.py:86
+#: templates/unanswered.html:73 templates/unanswered.html.py:78
+msgid "Updated:"
+msgstr ""
+
+#: templates/index.html:103 templates/question.html:480
+#: templates/question_summary_list_roll.html:52 templates/questions.html:103
+#: templates/questions.html.py:171 templates/tags.html:49
+#: templates/unanswered.html:95 templates/unanswered.html.py:122
+#: templates/users_questions.html:52
 msgid "see questions tagged"
 msgstr ""
 
-#: templates/index.html:80
+#: templates/index.html:114
 msgid "welcome to website"
-msgstr ""
+msgstr "Welcome to Q&amp;A forum"
 
-#: templates/index.html:89
+#: templates/index.html:123
 msgid "Recent tags"
 msgstr ""
 
-#: templates/index.html:94 templates/question.html:125
+#: templates/index.html:128 templates/question.html:135
 #, python-format
 msgid "see questions tagged '%(tagname)s'"
 msgstr ""
 
-#: templates/index.html:97 templates/index.html.py:123
+#: templates/index.html:131 templates/index.html.py:157
 msgid "popular tags"
 msgstr "tags"
 
-#: templates/index.html:102
+#: templates/index.html:136
 msgid "Recent awards"
 msgstr "Recent badges"
 
-#: templates/index.html:108
+#: templates/index.html:142
 msgid "given to"
 msgstr ""
 
-#: templates/index.html:113
+#: templates/index.html:147
 msgid "all awards"
 msgstr "all badges"
 
-#: templates/index.html:118
+#: templates/index.html:152
 msgid "subscribe to last 30 questions by RSS"
 msgstr ""
 
-#: templates/index.html:123
+#: templates/index.html:157
 msgid "Still looking for more? See"
 msgstr ""
 
-#: templates/index.html:123
+#: templates/index.html:157
 msgid "complete list of questions"
 msgstr "list of all questions"
 
-#: templates/index.html:123
+#: templates/index.html:157 templates/authopenid/signup.html:18
 msgid "or"
 msgstr ""
 
-#: templates/index.html:123
+#: templates/index.html:157
 msgid "Please help us answer"
 msgstr ""
 
-#: templates/index.html:123
+#: templates/index.html:157
 msgid "list of unanswered questions"
 msgstr "unanswered questions"
 
-#: templates/logout.html:6 templates/logout.html.py:17
+#: templates/logout.html:6 templates/logout.html.py:16
 msgid "Logout"
 msgstr ""
 
-#: templates/logout.html:20
+#: templates/logout.html:19
 msgid ""
 "As a registered user you can login with your OpenID, log out of the site or "
 "permanently remove your account."
 msgstr ""
-"Clicking <strong>Logout</strong> will log you out from the Q&amp;A forum.</"
-"p><p>If you wish to sign off completely - please make sure to log out from "
-"your OpenID provider."
+"Clicking <strong>Logout</strong> will log you out from the forum"
+"but will not sign you off from your OpenID provider.</p><p>If you wish to sign off "
+"completely - please make sure to log out from your OpenID provider as well."
 
-#: templates/logout.html:21
+#: templates/logout.html:20
 msgid "Logout now"
 msgstr "Logout Now"
 
@@ -1551,6 +1868,33 @@ msgstr ""
 msgid "next page"
 msgstr ""
 
+#: templates/post_contributor_info.html:9
+#, python-format
+msgid ""
+"\n"
+"                one revision\n"
+"            "
+msgid_plural ""
+"\n"
+"                %(rev_count)s revisions\n"
+"            "
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/post_contributor_info.html:19 templates/revisions_answer.html:66
+#: templates/revisions_question.html:66
+msgid "asked"
+msgstr ""
+
+#: templates/post_contributor_info.html:21
+msgid "answered"
+msgstr ""
+
+#: templates/post_contributor_info.html:37 templates/revisions_answer.html:68
+#: templates/revisions_question.html:68
+msgid "updated"
+msgstr ""
+
 #: templates/privacy.html:6 templates/privacy.html.py:11
 msgid "Privacy policy"
 msgstr ""
@@ -1558,6 +1902,10 @@ msgstr ""
 #: templates/privacy.html:15
 msgid "general message about privacy"
 msgstr ""
+"Respecting users privacy is an important core principle "
+"of this Q&amp;A forum. "
+"Information on this page details how this forum protects your privacy, "
+"and what type of information is collected."
 
 #: templates/privacy.html:18
 msgid "Site Visitors"
@@ -1566,6 +1914,9 @@ msgstr ""
 #: templates/privacy.html:20
 msgid "what technical information is collected about visitors"
 msgstr ""
+"Information on question views, revisions of questions and answers - both times "
+"and content are recorded for each user in order to correctly count number of views, "
+"maintain data integrity and report relevant updates."
 
 #: templates/privacy.html:23
 msgid "Personal Information"
@@ -1574,6 +1925,9 @@ msgstr ""
 #: templates/privacy.html:25
 msgid "details on personal information policies"
 msgstr ""
+"Members of this community may choose to display personally identifiable information "
+"in their profiles. Forum will never display such information "
+"without a request from the user."
 
 #: templates/privacy.html:28
 msgid "Other Services"
@@ -1582,10 +1936,15 @@ msgstr ""
 #: templates/privacy.html:30
 msgid "details on sharing data with third parties"
 msgstr ""
+"None of the data that is not openly shown on the forum by the choice of the user "
+"is shared with any third party."
 
 #: templates/privacy.html:35
 msgid "cookie policy details"
 msgstr ""
+"Forum software relies on the internet cookie technology to "
+"keep track of user sessions. Cookies must be enabled "
+"in your browser so that forum can work for you."
 
 #: templates/privacy.html:37
 msgid "Policy Changes"
@@ -1594,194 +1953,305 @@ msgstr ""
 #: templates/privacy.html:38
 msgid "how privacy policies can be changed"
 msgstr ""
+"These policies may be adjusted to improve protection of "
+"user's privacy. Whenever such changes occur, users will be "
+"notified via the internal messaging system. "
 
-#: templates/question.html:72 templates/question.html.py:73
-#: templates/question.html:85 templates/question.html.py:87
+#: templates/question.html:77 templates/question.html.py:78
+#: templates/question.html:94 templates/question.html.py:96
 msgid "i like this post (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:75 templates/question.html.py:89
-#: templates/question.html:289
+#: templates/question.html:80 templates/question.html.py:98
+#: templates/question.html:257
 msgid "current number of votes"
 msgstr ""
 
-#: templates/question.html:80 templates/question.html.py:81
-#: templates/question.html:94 templates/question.html.py:95
+#: templates/question.html:89 templates/question.html.py:90
+#: templates/question.html:103 templates/question.html.py:104
 msgid "i dont like this post (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:100 templates/question.html.py:101
+#: templates/question.html:109 templates/question.html.py:110
 msgid "mark this question as favorite (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:107 templates/question.html.py:108
+#: templates/question.html:116 templates/question.html.py:117
 msgid "remove favorite mark from this question (click again to restore mark)"
 msgstr ""
 
-#: templates/question.html:134 templates/question.html.py:322
-#: templates/revisions_answer.html:53 templates/revisions_question.html:53
+#: templates/question.html:140 templates/question.html.py:294
+#: templates/revisions_answer.html:56 templates/revisions_question.html:56
 msgid "edit"
 msgstr ""
 
-#: templates/question.html:138 templates/question.html.py:332
+#: templates/question.html:144 templates/question.html.py:301
 msgid "delete"
 msgstr ""
 
-#: templates/question.html:143
+#: templates/question.html:149
 msgid "reopen"
 msgstr ""
 
-#: templates/question.html:148
+#: templates/question.html:153
 msgid "close"
 msgstr ""
 
-#: templates/question.html:154 templates/question.html.py:345
+#: templates/question.html:159 templates/question.html.py:308
 msgid ""
 "report as offensive (i.e containing spam, advertising, malicious text, etc.)"
 msgstr ""
 
-#: templates/question.html:155 templates/question.html.py:346
+#: templates/question.html:160 templates/question.html.py:309
 msgid "flag offensive"
 msgstr ""
 
-#: templates/question.html:167 templates/question.html.py:355
-#: templates/revisions_answer.html:65 templates/revisions_question.html:65
-msgid "updated"
+#: templates/question.html:182 templates/question.html.py:331
+msgid "delete this comment"
 msgstr ""
 
-#: 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:193 templates/question.html.py:342
+msgid "add comment"
+msgstr "post a comment"
 
-#: templates/question.html:246 templates/question.html.py:429
-msgid "comments"
-msgstr ""
+#: templates/question.html:197
+#, python-format
+msgid ""
+"\n"
+"                                            see <strong>one</strong> more \n"
+"                                            "
+msgid_plural ""
+"\n"
+"                                            see <strong>%(counter)s</strong> "
+"more\n"
+"                                            "
+msgstr[0] ""
+msgstr[1] ""
 
-#: templates/question.html:247 templates/question.html.py:430
-msgid "add comment"
-msgstr ""
+#: templates/question.html:203
+#, python-format
+msgid ""
+"\n"
+"                                            see <strong>one</strong> more "
+"comment\n"
+"                                            "
+msgid_plural ""
+"\n"
+"                                            see <strong>%(counter)s</strong> "
+"more comments\n"
+"                                            "
+msgstr[0] ""
+msgstr[1] ""
 
-#: templates/question.html:260
+#: templates/question.html:219
 #, python-format
 msgid ""
-"The question has been closed for the following reason \"%(question."
-"get_close_reason_display)s\" by"
+"The question has been closed for the following reason \"%(close_reason)s\" by"
 msgstr ""
 
-#: templates/question.html:262
+#: templates/question.html:221
 #, python-format
-msgid "close date %(question.closed_at)s"
+msgid "close date %(closed_at)s"
 msgstr ""
 
-#: templates/question.html:269 templates/user_stats.html:13
-msgid "Answers"
-msgstr " Answers"
+#: templates/question.html:229
+#, python-format
+msgid ""
+"\n"
+"                    One Answer:\n"
+"                    "
+msgid_plural ""
+"\n"
+"                    %(counter)s Answers:\n"
+"                    "
+msgstr[0] ""
+msgstr[1] ""
 
-#: templates/question.html:271
+#: templates/question.html:237
 msgid "oldest answers will be shown first"
 msgstr ""
 
-#: templates/question.html:271
+#: templates/question.html:237
 msgid "oldest answers"
 msgstr "oldest"
 
-#: templates/question.html:272
+#: templates/question.html:239
 msgid "newest answers will be shown first"
 msgstr ""
 
-#: templates/question.html:272
+#: templates/question.html:239
 msgid "newest answers"
 msgstr "newest"
 
-#: templates/question.html:273
+#: templates/question.html:241
 msgid "most voted answers will be shown first"
 msgstr ""
 
-#: templates/question.html:273
+#: templates/question.html:241
 msgid "popular answers"
 msgstr "most voted"
 
-#: templates/question.html:287 templates/question.html.py:288
+#: templates/question.html:255 templates/question.html.py:256
 msgid "i like this answer (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:294 templates/question.html.py:295
+#: templates/question.html:262 templates/question.html.py:263
 msgid "i dont like this answer (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:300 templates/question.html.py:301
+#: templates/question.html:268 templates/question.html.py:269
 msgid "mark this answer as favorite (click again to undo)"
 msgstr ""
 
-#: templates/question.html:306 templates/question.html.py:307
+#: templates/question.html:274 templates/question.html.py:275
 msgid "the author of the question has selected this answer as correct"
 msgstr ""
 
-#: templates/question.html:329
+#: templates/question.html:288
+msgid "answer permanent link"
+msgstr ""
+
+#: templates/question.html:289
+msgid "permanent link"
+msgstr "link"
+
+#: templates/question.html:301
 msgid "undelete"
 msgstr ""
 
-#: templates/question.html:339
-msgid "answer permanent link"
+#: templates/question.html:346
+#, python-format
+msgid ""
+"\n"
+"                                                        see <strong>one</"
+"strong> more \n"
+"                                                        "
+msgid_plural ""
+"\n"
+"                                                        see <strong>%"
+"(counter)s</strong> more\n"
+"                                                        "
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/question.html:352
+#, python-format
+msgid ""
+"\n"
+"                                                        see <strong>one</"
+"strong> more comment\n"
+"                                                        "
+msgid_plural ""
+"\n"
+"                                                        see <strong>%"
+"(counter)s</strong> more comments\n"
+"                                                        "
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/question.html:378 templates/question.html.py:381
+msgid "Notify me once a day when there are any new answers"
 msgstr ""
+"<strong>Notify me</strong> once a day by email when there are any new "
+"answers or updates"
 
-#: templates/question.html:340
-msgid "permanent link"
+#: templates/question.html:384
+msgid "Notify me weekly when there are any new answers"
+msgstr ""
+"<strong>Notify me</strong> weekly when there are any new answers or updates"
+
+#: templates/question.html:389
+#, python-format
+msgid ""
+"\n"
+"                You can always adjust frequency of email updates from your %"
+"(profile_url)s\n"
+"                "
+msgstr ""
+"\n"
+"(note: you can always <a href='%(profile_url)s?"
+"sort=email_subscriptions'>adjust frequency</a> of email updates)"
+
+#: templates/question.html:396
+msgid "once you sign in you will be able to subscribe for any updates here"
 msgstr ""
+"<span class='strong'>Here</span> (once you log in) you will be able to sign "
+"up for the periodic email updates about this question."
 
-#: templates/question.html:453
+#: templates/question.html:407
 msgid "Your answer"
 msgstr ""
 
-#: templates/question.html:456
+#: templates/question.html:409
+msgid "Be the first one to answer this question!"
+msgstr ""
+
+#: templates/question.html:415
 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"
+"<span class='strong big'>Please start posting your answer anonymously</span> "
+"- your answer will be saved within the current session and published after "
+"you log in or create a new account. Please try to give a <strong>substantial "
+"answer</strong>, for discussions, <strong>please use comments</strong> and "
+"<strong>please do remember to vote</strong> (after you log in)!"
 
-#: templates/question.html:479
-msgid "Answer the question"
+#: templates/question.html:419
+msgid "answer your own question only to give an answer"
 msgstr ""
+"<span class='big strong'>You are welcome to answer your own question</span>, "
+"but please make sure to give an <strong>answer</strong>. Remember that you "
+"can always <strong>revise your original question</strong>. Please "
+"<strong>use comments for discussions</strong>  and <strong>please don't "
+"forget to vote :)</strong> for the answers that you liked (or perhaps did "
+"not like)! "
 
-#: templates/question.html:481
-msgid "Notify me daily if there are any new answers."
+#: templates/question.html:421
+msgid "please only give an answer, no discussions"
 msgstr ""
+"<span class='big strong'>Please try to give a substantial answer</span>. If "
+"you wanted to comment on the question or answer, just <strong>use the "
+"commenting tool</strong>. Please remember that you can always <strong>revise "
+"your answers</strong> - no need to answer the same question twice. Also, "
+"please <strong>don't forget to vote</strong> - it really helps to select the "
+"best questions and answers!"
 
-#: 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:457
+msgid "Login/Signup to Post Your Answer"
+msgstr ""
+
+#: templates/question.html:460
+msgid "Answer Your Own Question"
+msgstr ""
+
+#: templates/question.html:462
+msgid "Answer the question"
+msgstr "Post Your Answer"
 
-#: templates/question.html:494
+#: templates/question.html:475
 msgid "Question tags"
 msgstr "Tags"
 
-#: templates/question.html:504
+#: templates/question.html:485
 msgid "question asked"
 msgstr "Asked"
 
-#: templates/question.html:504 templates/question.html.py:510
-#: templates/user_info.html:51
-msgid "ago"
-msgstr ""
-
-#: templates/question.html:507
+#: templates/question.html:488
 msgid "question was seen"
 msgstr "Seen"
 
-#: templates/question.html:507
+#: templates/question.html:488
 msgid "times"
 msgstr ""
 
-#: templates/question.html:510
+#: templates/question.html:491
 msgid "last updated"
 msgstr "Last updated"
 
-#: templates/question.html:515
+#: templates/question.html:496
 msgid "Related questions"
 msgstr ""
 
-#: templates/question_edit.html:4 templates/question_edit.html.py:65
+#: templates/question_edit.html:5 templates/question_edit.html.py:66
 msgid "Edit question"
 msgstr ""
 
@@ -1791,57 +2261,57 @@ msgstr "Tips"
 
 #: templates/question_edit_tips.html:7
 msgid "please ask a relevant question"
-msgstr ""
+msgstr "ask a question relevant to the CNPROG community"
 
 #: templates/question_edit_tips.html:10
 msgid "please try provide enough details"
 msgstr "provide enough details"
 
-#: templates/question_retag.html:3 templates/question_retag.html.py:52
+#: templates/question_retag.html:4 templates/question_retag.html.py:53
 msgid "Change tags"
 msgstr ""
 
-#: templates/question_retag.html:39
+#: templates/question_retag.html:40
 msgid "up to 5 tags, less than 20 characters each"
 msgstr ""
 
-#: templates/question_retag.html:82
+#: templates/question_retag.html:83
 msgid "Why use and modify tags?"
 msgstr ""
 
-#: templates/question_retag.html:85
+#: templates/question_retag.html:86
 msgid "tags help us keep Questions organized"
 msgstr ""
 
-#: templates/question_retag.html:91
+#: templates/question_retag.html:94
 msgid "tag editors receive special awards from the community"
 msgstr ""
 
-#: templates/questions.html:23
+#: templates/questions.html:24
 msgid "Found by tags"
 msgstr "Tagged questions"
 
-#: templates/questions.html:23
+#: templates/questions.html:24
 msgid "Found by title"
 msgstr ""
 
-#: templates/questions.html:23
+#: templates/questions.html:24
 msgid "All questions"
 msgstr ""
 
-#: templates/questions.html:25 templates/unanswered.html:20
+#: templates/questions.html:26 templates/unanswered.html:21
 msgid "most recently asked questions"
 msgstr ""
 
-#: templates/questions.html:26
+#: templates/questions.html:27
 msgid "most recently updated questions"
 msgstr ""
 
-#: templates/questions.html:26
+#: templates/questions.html:27
 msgid "active"
 msgstr ""
 
-#: templates/questions.html:109
+#: templates/questions.html:126
 #, python-format
 msgid ""
 "\n"
@@ -1860,7 +2330,7 @@ msgstr[1] ""
 "<div class=\"questions-count\">%(q_num)s</div><p>questions tagged</p><div "
 "class=\"tags\"><span class=\"tag\">%(tagname)s</span></div>"
 
-#: templates/questions.html:116
+#: templates/questions.html:133
 #, python-format
 msgid ""
 "\n"
@@ -1881,7 +2351,7 @@ msgstr[1] ""
 "containing <strong><span class=\"darkred\">%(searchtitle)s</span></strong></"
 "p>"
 
-#: templates/questions.html:122
+#: templates/questions.html:139
 #, python-format
 msgid ""
 "\n"
@@ -1898,35 +2368,35 @@ msgstr[1] ""
 "\n"
 "<div class=\"questions-count\">%(q_num)s</div><p>questions</p>"
 
-#: templates/questions.html:131
+#: templates/questions.html:148
 msgid "latest questions info"
 msgstr "<strong>Newest</strong> questions are shown first."
 
-#: templates/questions.html:135
+#: templates/questions.html:152
 msgid "Questions are sorted by the <strong>time of last update</strong>."
 msgstr ""
 
-#: templates/questions.html:136
+#: templates/questions.html:153
 msgid "Most recently answered ones are shown first."
 msgstr "<strong>Most recently answered</strong> questions are shown first."
 
-#: templates/questions.html:140
+#: templates/questions.html:157
 msgid "Questions sorted by <strong>number of responses</strong>."
 msgstr "Questions sorted by the <strong>number of answers</strong>."
 
-#: templates/questions.html:141
+#: templates/questions.html:158
 msgid "Most answered questions are shown first."
 msgstr " "
 
-#: templates/questions.html:145
+#: templates/questions.html:162
 msgid "Questions are sorted by the <strong>number of votes</strong>."
 msgstr ""
 
-#: templates/questions.html:146
+#: templates/questions.html:163
 msgid "Most voted questions are shown first."
 msgstr ""
 
-#: templates/questions.html:153 templates/unanswered.html:102
+#: templates/questions.html:168 templates/unanswered.html:118
 msgid "Related tags"
 msgstr "Tags"
 
@@ -1963,6 +2433,10 @@ msgstr ""
 msgid "Revision history"
 msgstr ""
 
+#: templates/revisions_answer.html:48 templates/revisions_question.html:48
+msgid "click to hide/show revision"
+msgstr ""
+
 #: templates/tags.html:6 templates/tags.html.py:30
 msgid "Tag list"
 msgstr ""
@@ -1995,16 +2469,16 @@ msgstr ""
 msgid "Nothing found"
 msgstr ""
 
-#: templates/unanswered.html:7 templates/unanswered.html.py:18
+#: templates/unanswered.html:8 templates/unanswered.html.py:19
 msgid "Unanswered questions"
 msgstr ""
 
-#: templates/unanswered.html:97
+#: templates/unanswered.html:114
 #, python-format
 msgid "have %(num_q)s unanswered questions"
 msgstr ""
-"<div class=\"questions-count\">%(num_q)s</div><strong>unanswered</strong> "
-"questions"
+"<div class=\"questions-count\">%(num_q)s</div>questions <strong>without "
+"accepted answers</strong>"
 
 #: templates/user_edit.html:6
 msgid "Edit user profile"
@@ -2019,139 +2493,202 @@ msgid "image associated with your email address"
 msgstr ""
 
 #: templates/user_edit.html:31
-msgid "avatar"
-msgstr "<a href='/faq#gravatar'>gravatar</a>"
+#, python-format
+msgid "avatar, see %(gravatar_faq_url)s"
+msgstr "<a href='%(gravatar_faq_url)s'>gravatar</a>"
 
-#: templates/user_edit.html:36 templates/user_info.html:31
+#: templates/user_edit.html:36 templates/user_info.html:56
 msgid "Registered user"
 msgstr ""
 
-#: templates/user_edit.html:82
+#: templates/user_edit.html:82 templates/user_email_subscriptions.html:17
 msgid "Update"
 msgstr ""
 
-#: templates/user_info.html:34
+#: templates/user_email_subscriptions.html:8
+msgid "Email subscription settings"
+msgstr ""
+
+#: templates/user_email_subscriptions.html:9
+msgid "email subscription settings info"
+msgstr ""
+"<span class='big strong'>Adjust frequency of email updates.</span> Receive "
+"updates on interesting questions by email, <strong><br/>help the community</"
+"strong> by answering questions of your colleagues. If you do not wish to "
+"receive emails - select 'no email' on all items below.<br/>Updates are only "
+"sent when there is any new activity on selected items."
+
+#: templates/user_email_subscriptions.html:18
+msgid "Stop sending email"
+msgstr "Stop Email"
+
+#: templates/user_info.html:32
+msgid "Moderate this user"
+msgstr ""
+
+#: templates/user_info.html:45
 msgid "update profile"
 msgstr ""
 
-#: templates/user_info.html:40
+#: templates/user_info.html:60
 msgid "real name"
 msgstr ""
 
-#: templates/user_info.html:45
+#: templates/user_info.html:65
 msgid "member for"
-msgstr ""
+msgstr "member since"
 
-#: templates/user_info.html:50
+#: templates/user_info.html:70
 msgid "last seen"
 msgstr ""
 
-#: templates/user_info.html:56
+#: templates/user_info.html:76
 msgid "user website"
 msgstr ""
 
-#: templates/user_info.html:62
+#: templates/user_info.html:82
 msgid "location"
 msgstr ""
 
-#: templates/user_info.html:69
+#: templates/user_info.html:89
 msgid "age"
 msgstr ""
 
-#: templates/user_info.html:70
+#: templates/user_info.html:90
 msgid "age unit"
 msgstr "years old"
 
-#: templates/user_info.html:76
+#: templates/user_info.html:96
 msgid "todays unused votes"
 msgstr ""
 
-#: templates/user_info.html:77
+#: templates/user_info.html:97
 msgid "votes left"
 msgstr ""
 
-#: templates/user_preferences.html:10
-msgid "Connect with Twitter"
-msgstr ""
-
-#: templates/user_preferences.html:13
-msgid "Twitter account name:"
-msgstr ""
-
-#: templates/user_preferences.html:15
-msgid "Twitter password:"
-msgstr ""
-
-#: templates/user_preferences.html:17
-msgid "Send my Questions to Twitter"
-msgstr ""
-
-#: templates/user_preferences.html:18
-msgid "Send my Answers to Twitter"
-msgstr ""
-
-#: templates/user_preferences.html:19
-msgid "Save"
-msgstr ""
+#: templates/user_stats.html:12
+#, python-format
+msgid ""
+"\n"
+"                <span class=\"count\">1</span> Question\n"
+"                "
+msgid_plural ""
+"\n"
+"                <span class=\"count\">%(counter)s</span> Questions\n"
+"                "
+msgstr[0] ""
+msgstr[1] ""
 
-#: templates/user_stats.html:10
-msgid "User questions"
-msgstr ""
+#: templates/user_stats.html:23
+#, python-format
+msgid ""
+"\n"
+"                <span class=\"count\">1</span> Answer\n"
+"                "
+msgid_plural ""
+"\n"
+"                <span class=\"count\">%(counter)s</span> Answers\n"
+"                "
+msgstr[0] ""
+msgstr[1] ""
 
-#: templates/user_stats.html:20
+#: templates/user_stats.html:36
 #, python-format
 msgid "the answer has been voted for %(vote_count)s times"
 msgstr ""
 
-#: templates/user_stats.html:20
+#: templates/user_stats.html:36
 msgid "this answer has been selected as correct"
 msgstr ""
 
-#: templates/user_stats.html:28
+#: templates/user_stats.html:46
 #, python-format
-msgid "the answer has been commented %(comment_count)s times"
-msgstr ""
+msgid ""
+"\n"
+"                    (one comment)\n"
+"                    "
+msgid_plural ""
+"\n"
+"                    the answer has been commented %(comment_count)s times\n"
+"                    "
+msgstr[0] ""
+"\n"
+"(one comment)"
+msgstr[1] ""
+"\n"
+"(%(comment_count)s comments)"
 
-#: templates/user_stats.html:36
-msgid "Votes"
-msgstr ""
+#: templates/user_stats.html:61
+#, python-format
+msgid ""
+"\n"
+"                    <span class=\"count\">1</span> Vote\n"
+"                "
+msgid_plural ""
+"\n"
+"                    <span class=\"count\">%(cnt)s</span> Votes\n"
+"                "
+msgstr[0] ""
+msgstr[1] ""
 
-#: templates/user_stats.html:41
+#: templates/user_stats.html:72
 msgid "thumb up"
 msgstr ""
 
-#: templates/user_stats.html:42
+#: templates/user_stats.html:73
 msgid "user has voted up this many times"
 msgstr ""
 
-#: templates/user_stats.html:46
+#: templates/user_stats.html:77
 msgid "thumb down"
 msgstr ""
 
-#: templates/user_stats.html:47
+#: templates/user_stats.html:78
 msgid "user voted down this many times"
 msgstr ""
 
-#: templates/user_stats.html:54
-msgid "Tags"
-msgstr ""
+#: templates/user_stats.html:87
+#, python-format
+msgid ""
+"\n"
+"                    <span class=\"count\">1</span> Tag\n"
+"                "
+msgid_plural ""
+"\n"
+"                    <span class=\"count\">%(counter)s</span> Tags\n"
+"                "
+msgstr[0] ""
+msgstr[1] ""
 
-#: templates/user_stats.html:61
+#: templates/user_stats.html:100
 #, python-format
 msgid "see other questions tagged '%(tag)s' "
 msgstr ""
 
+#: templates/user_stats.html:114
+#, python-format
+msgid ""
+"\n"
+"            <span class=\"count\">1</span> Badge\n"
+"            "
+msgid_plural ""
+"\n"
+"            <span class=\"count\">%(counter)s</span> Badges\n"
+"            "
+msgstr[0] ""
+msgstr[1] ""
+
 #: templates/user_tabs.html:7
 msgid "User profile"
 msgstr ""
 
 #: templates/user_tabs.html:16
 msgid "graph of user reputation"
-msgstr ""
+msgstr "Graph of user karma"
 
 #: templates/user_tabs.html:17
 msgid "reputation history"
-msgstr ""
+msgstr "karma history"
 
 #: templates/user_tabs.html:23
 msgid "questions that user selected as his/her favorite"
@@ -2161,10 +2698,6 @@ msgstr ""
 msgid "favorites"
 msgstr ""
 
-#: templates/user_tabs.html:28
-msgid "settings"
-msgstr ""
-
 #: templates/users.html:6 templates/users.html.py:24
 msgid "Users"
 msgstr ""
@@ -2202,16 +2735,21 @@ msgstr ""
 msgid "thumb-up off"
 msgstr ""
 
-#: templates/users_questions.html:35
+#: templates/users_questions.html:34
 msgid "this answer has been accepted to be correct"
 msgstr ""
 
-#: templates/authopenid/changeemail.html:7
-#: templates/authopenid/changeemail.html:33
+#: templates/authopenid/changeemail.html:3
+#: templates/authopenid/changeemail.html:9
+#: templates/authopenid/changeemail.html:38
 msgid "Change email"
 msgstr "Change Email"
 
-#: templates/authopenid/changeemail.html:10
+#: templates/authopenid/changeemail.html:11
+msgid "Save your email address"
+msgstr ""
+
+#: templates/authopenid/changeemail.html:16
 #, python-format
 msgid "change %(email)s info"
 msgstr ""
@@ -2219,57 +2757,66 @@ msgstr ""
 "you'd like to use another email for <strong>update subscriptions</strong>."
 "<br>Currently you are using <strong>%(email)s</strong>"
 
-#: templates/authopenid/changeemail.html:13
-#: templates/authopenid/changeopenid.html:14
-#: templates/authopenid/changepw.html:19 templates/authopenid/delete.html:15
-#: templates/authopenid/delete.html:25
-msgid "Please correct errors below:"
+#: templates/authopenid/changeemail.html:18
+#, python-format
+msgid "here is why email is required, see %(gravatar_faq_url)s"
 msgstr ""
+"<span class='strong big'>Please enter your email address in the box below.</"
+"span> Valid email address is required on this Q&amp;"
+"A forum. If you like, you can <strong>receive updates</strong> on "
+"interesting questions or entire forum via email. Also, your email is used to "
+"create a unique <a href='%(gravatar_faq_url)s'><strong>gravatar</strong></a> "
+"image for your account. Email addresses are never shown or otherwise shared "
+"with anybody else."
 
-#: templates/authopenid/changeemail.html:30
+#: templates/authopenid/changeemail.html:31
 msgid "Your new Email"
 msgstr ""
 "<strong>Your new Email:</strong> (will <strong>not</strong> be shown to "
 "anyone, must be valid)"
 
 #: templates/authopenid/changeemail.html:31
-#: templates/authopenid/signin.html:154
-msgid "Password"
+msgid "Your Email"
+msgstr ""
+"<strong>Your Email</strong> (<i>must be valid, never shown to others</i>)"
+
+#: templates/authopenid/changeemail.html:38
+msgid "Save Email"
 msgstr ""
 
-#: templates/authopenid/changeemail.html:42
+#: templates/authopenid/changeemail.html:49
 msgid "Validate email"
 msgstr ""
 
-#: templates/authopenid/changeemail.html:45
+#: templates/authopenid/changeemail.html:52
 #, python-format
-msgid "validate %(email)s info"
+msgid "validate %(email)s info or go to %(change_email_url)s"
 msgstr ""
 "<span class=\"strong big\">An email with a validation link has been sent to %"
 "(email)s.</span> Please <strong>follow the emailed link</strong> with your "
 "web browser. Email validation is necessary to help insure the proper use of "
-"email on <span class=\"orange\">Q&amp;A</span> forum. If you would like "
-"to use <strong>another email</strong>, please <a href=\"/email/change/"
-"\"><strong>change it again</strong></a>."
+"email on <span class=\"orange\">Q&amp;A</span>. If you would like "
+"to use <strong>another email</strong>, please <a href='%(change_email_url)"
+"s'><strong>change it again</strong></a>."
 
-#: templates/authopenid/changeemail.html:50
+#: templates/authopenid/changeemail.html:57
 msgid "Email not changed"
 msgstr ""
 
-#: templates/authopenid/changeemail.html:53
+#: templates/authopenid/changeemail.html:60
 #, python-format
-msgid "old %(email)s kept"
+msgid "old %(email)s kept, if you like go to %(change_email_url)s"
 msgstr ""
 "<span class=\"strong big\">Your email address %(email)s has not been changed."
 "</span> If you decide to change it later - you can always do it by editing "
-"it in your user profile or by using the <a href=\"/email/change/"
-"\"><strong>previous form</strong></a> again."
+"it in your user profile or by using the <a href='%(change_email_url)"
+"s'><strong>previous form</strong></a> again."
 
-#: templates/authopenid/changeemail.html:58
+#: templates/authopenid/changeemail.html:65
 msgid "Email changed"
 msgstr ""
 
-#: templates/authopenid/changeemail.html:61
+#: templates/authopenid/changeemail.html:68
 #, python-format
 msgid "your current %(email)s can be used for this"
 msgstr ""
@@ -2278,11 +2825,11 @@ msgstr ""
 "Email notifications are sent once a day or less frequently - only when there "
 "are any news."
 
-#: templates/authopenid/changeemail.html:66
+#: templates/authopenid/changeemail.html:73
 msgid "Email verified"
 msgstr ""
 
-#: templates/authopenid/changeemail.html:69
+#: templates/authopenid/changeemail.html:76
 msgid "thanks for verifying email"
 msgstr ""
 "<span class=\"big strong\">Thank you for verifying your email!</span> Now "
@@ -2291,11 +2838,11 @@ msgstr ""
 "updates</strong> - then will be notified about changes <strong>once a day</"
 "strong> or less frequently."
 
-#: templates/authopenid/changeemail.html:74
+#: templates/authopenid/changeemail.html:81
 msgid "email key not sent"
 msgstr "Validation email not sent"
 
-#: templates/authopenid/changeemail.html:77
+#: templates/authopenid/changeemail.html:84
 #, python-format
 msgid "email key not sent %(email)s change email here %(change_link)s"
 msgstr ""
@@ -2303,6 +2850,12 @@ msgstr ""
 "validated before</span> so the new key was not sent. You can <a href='%"
 "(change_link)s'>change</a> email used for update subscriptions if necessary."
 
+#: templates/authopenid/changeopenid.html:4
+#: templates/authopenid/changeopenid.html:30
+#: templates/authopenid/settings.html:34
+msgid "Change OpenID"
+msgstr ""
+
 #: templates/authopenid/changeopenid.html:8
 msgid "Account: change OpenID URL"
 msgstr ""
@@ -2312,97 +2865,129 @@ msgid ""
 "This is where you can change your OpenID URL. Make sure you remember it!"
 msgstr ""
 
+#: templates/authopenid/changeopenid.html:14
+#: templates/authopenid/delete.html:14 templates/authopenid/delete.html:24
+msgid "Please correct errors below:"
+msgstr ""
+
 #: templates/authopenid/changeopenid.html:29
 msgid "OpenID URL:"
 msgstr ""
 
-#: templates/authopenid/changeopenid.html:30
-msgid "Change OpenID"
+#: templates/authopenid/changepw.html:5 templates/authopenid/changepw.html:14
+#: templates/authopenid/settings.html:29
+msgid "Change password"
 msgstr ""
 
-#: templates/authopenid/changepw.html:14
+#: templates/authopenid/changepw.html:7
 msgid "Account: change password"
-msgstr ""
+msgstr "Change your password"
 
-#: templates/authopenid/changepw.html:17
+#: templates/authopenid/changepw.html:8
 msgid "This is where you can change your password. Make sure you remember it!"
 msgstr ""
+"<span class='strong'>To change your password</span> please fill out and "
+"submit this form"
 
-#: templates/authopenid/changepw.html:27
-msgid "Current password"
-msgstr ""
-
-#: templates/authopenid/changepw.html:28
-msgid "New password"
-msgstr ""
-
-#: templates/authopenid/changepw.html:29
-msgid "New password again"
-msgstr ""
-
-#: templates/authopenid/changepw.html:30 templates/authopenid/settings.html:29
-msgid "Change password"
-msgstr ""
-
-#: templates/authopenid/complete.html:5
+#: templates/authopenid/complete.html:19
 msgid "Connect your OpenID with this site"
 msgstr "New user signup"
 
-#: templates/authopenid/complete.html:8
+#: templates/authopenid/complete.html:22
 msgid "Connect your OpenID with your account on this site"
 msgstr "New user signup"
 
-#: templates/authopenid/complete.html:12
+#: templates/authopenid/complete.html:27
 #, python-format
-msgid "register new %(provider)s account info"
+msgid "register new %(provider)s account info, see %(gravatar_faq_url)s"
 msgstr ""
 "<p><span class=\"big strong\">You are here for the first time with your %"
 "(provider)s login.</span> Please create your <strong>screen name</strong> "
 "and save your <strong>email</strong> address. Saved email address will let "
 "you <strong>subscribe for the updates</strong> on the most interesting "
 "questions and will be used to create and retrieve your unique avatar image - "
-"<a href='/faq#gravatar'><strong>gravatar</strong></a>."
+"<a href='%(gravatar_faq_url)s'><strong>gravatar</strong></a>.</p>"
 
-#: templates/authopenid/complete.html:14
+#: templates/authopenid/complete.html:31
+#, python-format
+msgid ""
+"%(username)s already exists, choose another name for \n"
+"                            %(provider)s. Email is required too, see %"
+"(gravatar_faq_url)s\n"
+"                        "
+msgstr ""
+"<p><span class='strong big'>Oops... looks like screen name %(username)s is "
+"already used in another account.</span></p><p>Please choose another screen name "
+"to use with your %(provider)s login. Also, a valid email address is "
+"required on the <span class='orange'>Q&amp;A</span> forum. Your "
+"email is used to create a unique <a href='%(gravatar_faq_url)"
+"s'><strong>gravatar</strong></a> image for your account. If you like, "
+"you can <strong>receive updates</strong> on the interesting questions or "
+"entire forum by email. Email addresses are never shown or otherwise shared "
+"with anybody else.</p>"
+
+#: templates/authopenid/complete.html:35
+#, python-format
+msgid ""
+"register new external %(provider)s account info, see %(gravatar_faq_url)s"
+msgstr ""
+"<p><span class=\"big strong\">You are here for the first time with your %"
+"(provider)s login.</span></p><p>You can either keep your <strong>screen "
+"name</strong> the same as your %(provider)s login name  or choose some other "
+"nickname.</p><p>Also, please save a valid <strong>email</strong> address. "
+"With the email you can <strong>subscribe for the updates</strong> on the "
+"most interesting questions. Email address is also used to create and "
+"retrieve your unique avatar image - <a href='%(gravatar_faq_url)"
+"s'><strong>gravatar</strong></a>.</p>"
+
+#: templates/authopenid/complete.html:40
 msgid "This account already exists, please use another."
 msgstr ""
 
-#: templates/authopenid/complete.html:19 templates/authopenid/complete.html:32
-#: templates/authopenid/signin.html:138
+#: templates/authopenid/complete.html:55
 msgid "Sorry, looks like we have some errors:"
 msgstr ""
 
-#: templates/authopenid/complete.html:47
+#: templates/authopenid/complete.html:76
 msgid "Screen name label"
 msgstr "<strong>Screen Name</strong> (<i>will be shown to others</i>)"
 
-#: templates/authopenid/complete.html:48
+#: templates/authopenid/complete.html:83
 msgid "Email address label"
 msgstr ""
 "<strong>Email Address</strong> (<i>will <strong>not</strong> be shared with "
 "anyone, must be valid</i>)"
 
-#: templates/authopenid/complete.html:49
+#: templates/authopenid/complete.html:89 templates/authopenid/signup.html:15
+msgid "receive updates motivational blurb"
+msgstr ""
+"<strong>Receive forum updates by email</strong> - this will help our "
+"community grow and become more useful.<br/>By default "
+"<span class='orange'>Q&amp;A</span> forum sends up to <strong>one "
+"email digest per week</strong>  - only when there is anything new.<br/>If "
+"you like, please adjust this now or any time later from your user account."
+
+#: templates/authopenid/complete.html:91
 msgid "create account"
 msgstr "Signup"
 
-#: templates/authopenid/complete.html:56
+#: templates/authopenid/complete.html:100
 msgid "Existing account"
 msgstr ""
 
-#: templates/authopenid/complete.html:57
+#: templates/authopenid/complete.html:101
 msgid "user name"
 msgstr ""
 
-#: templates/authopenid/complete.html:58 templates/authopenid/signin.html:128
+#: templates/authopenid/complete.html:102
 msgid "password"
 msgstr ""
 
-#: templates/authopenid/complete.html:61
+#: templates/authopenid/complete.html:107
 msgid "Register"
 msgstr ""
 
-#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:156
+#: templates/authopenid/complete.html:108 templates/authopenid/signin.html:140
 msgid "Forgot your password?"
 msgstr ""
 
@@ -2415,12 +3000,11 @@ msgid "Your account details are:"
 msgstr ""
 
 #: templates/authopenid/confirm_email.txt:6
-#: templates/authopenid/sendpw_email.txt:7
 msgid "Username:"
 msgstr ""
 
 #: templates/authopenid/confirm_email.txt:7
-#: templates/authopenid/delete.html:20
+#: templates/authopenid/delete.html:19
 msgid "Password:"
 msgstr ""
 
@@ -2430,45 +3014,51 @@ msgstr ""
 
 #: templates/authopenid/confirm_email.txt:12
 #: templates/authopenid/email_validation.txt:14
-#: templates/authopenid/sendpw_email.txt:13
+#: templates/authopenid/sendpw_email.txt:8
 msgid ""
 "Sincerely,\n"
 "Forum Administrator"
 msgstr ""
+"Sincerely,\n"
+"Q&A Forum Administrator"
 
-#: templates/authopenid/delete.html:9
+#: templates/authopenid/delete.html:4 templates/authopenid/settings.html:38
+msgid "Delete account"
+msgstr ""
+
+#: templates/authopenid/delete.html:8
 msgid "Account: delete account"
 msgstr ""
 
-#: templates/authopenid/delete.html:13
+#: templates/authopenid/delete.html:12
 msgid ""
 "Note: After deleting your account, anyone will be able to register this "
 "username."
 msgstr ""
 
-#: templates/authopenid/delete.html:17
+#: templates/authopenid/delete.html:16
 msgid "Check confirm box, if you want delete your account."
 msgstr ""
 
-#: templates/authopenid/delete.html:32
+#: templates/authopenid/delete.html:31
 msgid "I am sure I want to delete my account."
 msgstr ""
 
-#: templates/authopenid/delete.html:33
+#: templates/authopenid/delete.html:32
 msgid "Password/OpenID URL"
 msgstr ""
 
-#: templates/authopenid/delete.html:33
+#: templates/authopenid/delete.html:32
 msgid "(required for your security)"
 msgstr ""
 
-#: templates/authopenid/delete.html:35
+#: templates/authopenid/delete.html:34
 msgid "Delete account permanently"
 msgstr ""
 
 #: templates/authopenid/email_validation.txt:2
 msgid "Greetings from the Q&A forum"
-msgstr "Greetings from the Q&amp;A forum"
+msgstr ""
 
 #: templates/authopenid/email_validation.txt:4
 msgid "To make use of the Forum, please follow the link below:"
@@ -2485,38 +3075,33 @@ msgid ""
 "for any inconvenience"
 msgstr ""
 
-#: templates/authopenid/sendpw.html:4 templates/authopenid/sendpw.html.py:8
-msgid "Send new password"
-msgstr ""
-
-#: templates/authopenid/sendpw.html:12
-msgid "Lost your password? No problem - here you can reset it."
+#: templates/authopenid/external_legacy_login_info.html:4
+#: templates/authopenid/external_legacy_login_info.html:7
+msgid "Traditional login information"
 msgstr ""
 
-#: templates/authopenid/sendpw.html:13
-msgid ""
-"Please enter your username below and new password will be sent to your "
-"registered e-mail"
-msgstr ""
+#: templates/authopenid/sendpw.html:4 templates/authopenid/sendpw.html.py:7
+msgid "Send new password"
+msgstr "Recover password"
 
-#: templates/authopenid/sendpw.html:28
-msgid "User name"
+#: templates/authopenid/sendpw.html:10
+msgid "password recovery information"
 msgstr ""
+"<span class='big strong'>Forgot you password? No problems - just get a new "
+"one!</span><br/>Please follow the following steps:<br/>&bull; submit your "
+"user name below and check your email<br/>&bull; <strong>follow the "
+"activation link</strong> for the new password - sent to you by email and "
+"login with the suggested password<br/>&bull; at this you might want to "
+"change your password to something you can remember better"
 
-#: templates/authopenid/sendpw.html:30
+#: templates/authopenid/sendpw.html:21
 msgid "Reset password"
-msgstr ""
+msgstr "Send me a new password"
 
-#: templates/authopenid/sendpw.html:30
+#: templates/authopenid/sendpw.html:22
 msgid "return to login"
 msgstr ""
 
-#: templates/authopenid/sendpw.html:33
-msgid ""
-"Note: your new password will be activated only after you click the "
-"activation link in the email message"
-msgstr ""
-
 #: templates/authopenid/sendpw_email.txt:2
 #, python-format
 msgid ""
@@ -2525,15 +3110,18 @@ msgid ""
 msgstr ""
 
 #: templates/authopenid/sendpw_email.txt:5
-msgid "Your new account details are:"
-msgstr ""
-
-#: templates/authopenid/sendpw_email.txt:8
-msgid "New password:"
+#, python-format
+msgid ""
+"email explanation how to use new %(password)s for %(username)s\n"
+"with the %(key_link)s"
 msgstr ""
+"To change your password, please follow these steps:\n"
+"* visit this link: %(key_link)s\n"
+"* login with user name %(username)s and password %(password)s\n"
+"* go to your user profile and set the password to something you can remember"
 
-#: templates/authopenid/sendpw_email.txt:10
-msgid "To confirm that you wanted to reset your password please visit:"
+#: templates/authopenid/settings.html:4
+msgid "Account functions"
 msgstr ""
 
 #: templates/authopenid/settings.html:30
@@ -2552,15 +3140,11 @@ msgstr ""
 msgid "Change openid associated to your account"
 msgstr ""
 
-#: templates/authopenid/settings.html:38
-msgid "Delete account"
-msgstr ""
-
 #: templates/authopenid/settings.html:39
 msgid "Erase your username and all your data from website"
 msgstr ""
 
-#: templates/authopenid/signin.html:4 templates/authopenid/signin.html:21
+#: templates/authopenid/signin.html:5 templates/authopenid/signin.html:21
 msgid "User login"
 msgstr "User login"
 
@@ -2588,148 +3172,105 @@ msgstr ""
 "strong> %(summary)s...\"</i> <span class=\"strong big\">is saved and will be "
 "posted once you log in.</span>"
 
-#: templates/authopenid/signin.html:40
+#: templates/authopenid/signin.html:42
 msgid "Click to sign in through any of these services."
 msgstr ""
-"<p><span class=\"big strong\">Please select your favorite login method below.</span>"
-"</p><p><font color=\"gray\">External login services use <a "
-"href=\"http://openid.net\"><b>OpenID</b></a> technology that increases "
-"security of your online identity and makes login process simpler. First option "
-"requires login name and password.</font></p>"
+"<p><span class=\"big strong\">Please select your favorite login method below."
+"</span></p><p><font color=\"gray\">External login services use <a href="
+"\"http://openid.net\"><b>OpenID</b></a> technology, where your password "
+"always stays confidential between you and your login provider and you don't "
+"have to remember another one. CNPROG option requires your login name and "
+"password entered here.</font></p>"
 
-#: templates/authopenid/signin.html:113
+#: templates/authopenid/signin.html:117
 msgid "Enter your <span id=\"enter_your_what\">Provider user name</span>"
 msgstr ""
-"<span class=\"big strong\">Enter your <span id=\"enter_your_what\">Provider "
-"user name</span></span><br><span class='grey'>(or select another login method above)</span>"
+"<span class=\"big strong\">Enter your </span><span id=\"enter_your_what\" "
+"class='big strong'>Provider user name</span><br/><span class='grey'>(or "
+"select another login method above)</span>"
 
-#: templates/authopenid/signin.html:120
+#: templates/authopenid/signin.html:124
 msgid ""
 "Enter your <a class=\"openid_logo\" href=\"http://openid.net\">OpenID</a> "
 "web address"
 msgstr ""
 "<span class=\"big strong\">Enter your <a class=\"openid_logo\" href=\"http://"
-"openid.net\">OpenID</a> web address</span><br><span class='grey'>(or choose another login "
-"method above)</span>"
+"openid.net\">OpenID</a> web address</span><br/><span class='grey'>(or choose "
+"another login method above)</span>"
 
-#: templates/authopenid/signin.html:122 templates/authopenid/signin.html:130
-#: templates/authopenid/signin.html:155
+#: templates/authopenid/signin.html:126 templates/authopenid/signin.html:138
 msgid "Login"
 msgstr ""
 
-#: templates/authopenid/signin.html:125
+#: templates/authopenid/signin.html:129
 msgid "Enter your login name and password"
 msgstr ""
-"<span class='big strong'>Enter your forum login and password</span><br/>"
-"<span class='grey'>(or select your OpenID provider above)</span>"
-
-#: templates/authopenid/signin.html:126
-msgid "login name"
-msgstr ""
-
-#: templates/authopenid/signin.html:134
-msgid "we support two login modes"
-msgstr ""
-"You can log in either through one of these services or traditionally - using "
-"local username/password."
+"<span class='big strong'>Enter your CNPROG login and password</span><br/"
+"><span class='grey'>(or select your OpenID provider above)</span>"
 
-#: templates/authopenid/signin.html:152
-msgid "Use login name and password"
+#: templates/authopenid/signin.html:133
+msgid "Login name"
 msgstr ""
 
-#: templates/authopenid/signin.html:153
-msgid "Login name"
+#: templates/authopenid/signin.html:135
+msgid "Password"
 msgstr ""
 
-#: templates/authopenid/signin.html:157
-msgid "Create new account"
+#: templates/authopenid/signin.html:139
+msgid "Create account"
 msgstr ""
 
-#: templates/authopenid/signin.html:166
+#: templates/authopenid/signin.html:149
 msgid "Why use OpenID?"
 msgstr ""
 
-#: templates/authopenid/signin.html:169
+#: templates/authopenid/signin.html:152
 msgid "with openid it is easier"
 msgstr "With the OpenID you don't need to create new username and password."
 
-#: templates/authopenid/signin.html:172
+#: templates/authopenid/signin.html:155
 msgid "reuse openid"
 msgstr "You can safely re-use the same login for all OpenID-enabled websites."
 
-#: templates/authopenid/signin.html:175
+#: templates/authopenid/signin.html:158
 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:178
+#: templates/authopenid/signin.html:161
 msgid "openid is supported open standard"
 msgstr "OpenID is based on an open standard, supported by many organizations."
 
-#: templates/authopenid/signin.html:183
+#: templates/authopenid/signin.html:166
 msgid "Find out more"
 msgstr ""
 
-#: templates/authopenid/signin.html:184
+#: templates/authopenid/signin.html:167
 msgid "Get OpenID"
 msgstr ""
 
-#: templates/authopenid/signup.html:4 templates/authopenid/signup.html.py:8
+#: templates/authopenid/signup.html:4
 msgid "Signup"
 msgstr ""
 
-#: templates/authopenid/signup.html:12
-msgid ""
-"We support two types of user registration: conventional username/password, "
-"and"
+#: templates/authopenid/signup.html:8
+msgid "Create login name and password"
 msgstr ""
 
-#: templates/authopenid/signup.html:12
-msgid "the OpenID method"
+#: templates/authopenid/signup.html:10
+msgid "Traditional signup info"
 msgstr ""
+"<span class='strong big'>If you prefer, create your forum login name and "
+"password here. However</span>, please keep in mind that we also support "
+"<strong>OpenID</strong> login method. With <strong>OpenID</strong> you can "
+"simply reuse your external login (e.g. Gmail or AOL) without ever sharing "
+"your login details with anyone and having to remember yet another password."
 
 #: templates/authopenid/signup.html:17
-msgid "Sorry, looks like we have some errors"
+msgid "Create Account"
 msgstr ""
 
-#: templates/authopenid/signup.html:35
-msgid "Conventional registration"
+#: templates/authopenid/signup.html:19
+msgid "return to OpenID login"
 msgstr ""
-
-#: templates/authopenid/signup.html:36
-msgid "choose a user name"
-msgstr ""
-
-#: templates/authopenid/signup.html:42
-msgid "back to login"
-msgstr ""
-
-#: templates/authopenid/signup.html:46
-msgid "Register with your OpenID"
-msgstr ""
-
-#: templates/authopenid/signup.html:49
-msgid "Login with your OpenID"
-msgstr ""
-
-#
-#~ msgid "editing tips"
-#~ msgstr "Tips"
-
-#~ msgid "Newest questions shown first."
-#~ msgstr ""
-#~ "Questions are sorted by <strong>entry date</strong>.Newest questions "
-#~ "shown first."
-
-#~ msgid ""
-#~ "please use space to separate tags (this enables autocomplete feature)"
-#~ msgstr "please use space to separate tags (uses autocomplete utility)"
-
-#~ msgid "select openid provider"
-#~ msgstr "1) Please select your id service provider."
-
-#~ msgid "verify openid link and login"
-#~ msgstr ""
-#~ "2) Please verify the OpenID URL (type your login name over {username}, if "
-#~ "present) and then log in."
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index 91639ba1..fc7ebe14 100644
--- a/locale/es/LC_MESSAGES/django.mo
+++ b/locale/es/LC_MESSAGES/django.mo
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index d7655dd7..b528fcf2 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -2,21 +2,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-17 16:44+0000\n"
-"PO-Revision-Date: 2009-08-17 10:04-0600\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: settings.py:12 urls.py:25 forum/views.py:310 forum/views.py:705
+#: settings.py:12 urls.py:25 forum/views.py:304 forum/views.py:698
 msgid "account/"
 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:310 forum/views.py:706
+#: django_authopenid/urls.py:13 forum/views.py:304 forum/views.py:699
+#: templates/authopenid/confirm_email.txt:10
 msgid "signin/"
 msgstr "ingresar/"
 
@@ -24,132 +25,127 @@ msgstr "ingresar/"
 msgid "upfiles/"
 msgstr "archivossubidos/"
 
-#: urls.py:27 django_authopenid/urls.py:16
-msgid "signup/"
-msgstr "registrarse/"
-
-#: urls.py:28 urls.py:29 urls.py:30 django_authopenid/urls.py:26
+#: urls.py:27 urls.py:28 urls.py:29 django_authopenid/urls.py:26
 #: django_authopenid/urls.py:27
 msgid "email/"
 msgstr "email/"
 
-#: urls.py:28
+#: urls.py:27
 msgid "change/"
 msgstr "cambiar/"
 
-#: urls.py:29
+#: urls.py:28
 msgid "sendkey/"
 msgstr "enviarclave/"
 
-#: urls.py:30
+#: urls.py:29
 msgid "verify/"
 msgstr "verificar/"
 
-#: urls.py:31
+#: urls.py:30
 msgid "about/"
 msgstr "acercadenosotros/"
 
-#: urls.py:32
+#: urls.py:31
 msgid "faq/"
 msgstr "preguntasfrecuentes/"
 
-#: urls.py:33
+#: urls.py:32
 msgid "privacy/"
 msgstr "códigodeprivacidad/"
 
-#: urls.py:34
+#: urls.py:33
 msgid "logout/"
 msgstr "cerrarsesion/"
 
-#: urls.py:35 urls.py:36 urls.py:37 urls.py:49 forum/models.py:425
+#: urls.py:34 urls.py:35 urls.py:36 urls.py:48 forum/models.py:418
 msgid "answers/"
 msgstr "respuestas/"
 
-#: urls.py:35 urls.py:47
+#: urls.py:34 urls.py:46
 msgid "comments/"
 msgstr "comentarios/"
 
-#: urls.py:36 urls.py:41 urls.py:55 templates/user_info.html:34
+#: urls.py:35 urls.py:40 urls.py:54 templates/user_info.html:34
 msgid "edit/"
 msgstr "editar/"
 
-#: urls.py:37 urls.py:46
+#: urls.py:36 urls.py:45
 msgid "revisions/"
 msgstr "revisiones/"
 
-#: 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 urls.py:48 forum/feed.py:19
-#: forum/models.py:313 forum/views.py:1232 forum/views.py:1234
-#: forum/views.py:1474
+#: 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 "preguntas/"
 
-#: urls.py:39 urls.py:65
+#: urls.py:38 urls.py:64
 msgid "ask/"
 msgstr "preguntar/"
 
-#: urls.py:40
+#: urls.py:39
 msgid "unanswered/"
 msgstr "sinrespuesta/"
 
-#: urls.py:42
+#: urls.py:41
 msgid "close/"
 msgstr "cerrar/"
 
-#: urls.py:43
+#: urls.py:42
 msgid "reopen/"
 msgstr "reabrir/"
 
-#: urls.py:44
+#: urls.py:43
 msgid "answer/"
 msgstr "respuesta/"
 
-#: urls.py:45
+#: urls.py:44
 msgid "vote/"
 msgstr "votar/"
 
-#: urls.py:48 urls.py:49 django_authopenid/urls.py:29
+#: urls.py:47 urls.py:48 django_authopenid/urls.py:29
 msgid "delete/"
 msgstr "borrar/"
 
-#: urls.py:51
+#: urls.py:50
 msgid "question/"
 msgstr "pregunta/"
 
-#: urls.py:52 urls.py:53 forum/views.py:747 forum/views.py:2071
+#: urls.py:51 urls.py:52 forum/views.py:740 forum/views.py:2013
 msgid "tags/"
 msgstr "etiquetas/"
 
-#: urls.py:54 urls.py:55 urls.py:56 forum/views.py:1034 forum/views.py:1038
-#: forum/views.py:1476 forum/views.py:1809 forum/views.py:2073
+#: 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 "usuarios/"
 
-#: urls.py:57 urls.py:58
+#: urls.py:56 urls.py:57
 msgid "badges/"
 msgstr "distinciones/"
 
-#: urls.py:59
+#: urls.py:58
 msgid "messages/"
 msgstr "mensajes/"
 
-#: urls.py:59
+#: urls.py:58
 msgid "markread/"
 msgstr "marcarleido/"
 
-#: urls.py:61
+#: urls.py:60
 msgid "nimda/"
 msgstr "administrador/"
 
-#: urls.py:63
+#: urls.py:62
 msgid "upload/"
 msgstr "subir/"
 
-#: urls.py:64 urls.py:65 urls.py:66
+#: urls.py:63 urls.py:64 urls.py:65
 msgid "books/"
 msgstr "libros/"
 
-#: urls.py:67
+#: urls.py:66
 msgid "search/"
 msgstr "buscar/"
 
@@ -244,7 +240,7 @@ msgstr "la nueva contraseña no coincide"
 msgid "Incorrect username."
 msgstr "Nombre de usuario incorrecto"
 
-#: django_authopenid/urls.py:10 forum/views.py:310 forum/views.py:706
+#: django_authopenid/urls.py:10 forum/views.py:304 forum/views.py:699
 msgid "newquestion/"
 msgstr "nuevapregunta/"
 
@@ -264,19 +260,14 @@ msgstr "completado/"
 msgid "register/"
 msgstr "registrarse/"
 
-#: django_authopenid/urls.py:19
+#: django_authopenid/urls.py:16
+msgid "signup/"
+msgstr "registrarse/"
+
+#: django_authopenid/urls.py:18
 msgid "sendpw/"
 msgstr "enviarcontrasena/"
 
-#: django_authopenid/urls.py:20
-#, fuzzy
-msgid "password/"
-msgstr "contraseña"
-
-#: django_authopenid/urls.py:20
-msgid "confirm/"
-msgstr ""
-
 #: django_authopenid/urls.py:27
 msgid "validate/"
 msgstr ""
@@ -532,8 +523,8 @@ msgstr ""
 "por favor use solo los siguientes caracteres en los nombres de etiquetas: "
 "letras 'a-z', números y caracteres '.-_#'"
 
-#: forum/forms.py:75 templates/index.html:57 templates/question.html:210
-#: templates/question.html.py:396 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"
@@ -559,84 +550,75 @@ msgstr ""
 "ingresa un breve resumen de tu revisión (ej. error ortográfico, gramática, "
 "mejoras de estilo. Este campo es opcional."
 
-#: forum/forms.py:98 forum/forms.py:159
-msgid "please choice a category"
-msgstr "por favor escoja una categoría"
-
-#: forum/forms.py:99 forum/forms.py:160
-msgid "Category"
-msgstr "Categoría"
-
-#: forum/forms.py:180
+#: forum/forms.py:175
 msgid "this email does not have to be linked to gravatar"
 msgstr "este email no tiene porque estar asociado a un Gravatar"
 
-#: forum/forms.py:181
+#: forum/forms.py:176
 msgid "Real name"
 msgstr "Nombre real"
 
-#: forum/forms.py:182
+#: forum/forms.py:177
 msgid "Website"
 msgstr "Sitio Web"
 
-#: forum/forms.py:183
+#: forum/forms.py:178
 msgid "Location"
 msgstr "Ubicación"
 
-#: forum/forms.py:184
+#: forum/forms.py:179
 msgid "Date of birth"
 msgstr "Fecha de nacimiento"
 
-#: forum/forms.py:184
+#: forum/forms.py:179
 msgid "will not be shown, used to calculate age, format: YYYY-MM-DD"
 msgstr "no será mostrado, usado para calcular la edad. Formato: YYY-MM-DD"
 
-#: forum/forms.py:185 templates/authopenid/settings.html:21
+#: forum/forms.py:180 templates/authopenid/settings.html:21
 msgid "Profile"
 msgstr "Perfil"
 
-#: forum/forms.py:212 forum/forms.py:213
+#: forum/forms.py:207 forum/forms.py:208
 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:253
-#, python-format
+#: forum/models.py:246
 msgid "%(author)s modified the question"
 msgstr "%(author)s modificó la pregunta"
 
-#: forum/models.py:257
+#: forum/models.py:250
 #, python-format
 msgid "%(people)s posted %(new_answer_count)s new answers"
 msgstr "%(people)s publicaron %(new_answer_count)s nuevas respuestas"
 
-#: forum/models.py:262
+#: forum/models.py:255
 #, python-format
 msgid "%(people)s commented the question"
 msgstr "%(people)s comentarion la pregunta"
 
-#: forum/models.py:267
+#: forum/models.py:260
 #, python-format
 msgid "%(people)s commented answers"
 msgstr "%(people)s comentaron la respuesta"
 
-#: forum/models.py:269
+#: forum/models.py:262
 #, python-format
 msgid "%(people)s commented an answer"
 msgstr "%(people)s comentaron la respuesta"
 
-#: forum/models.py:313 forum/models.py:425
+#: forum/models.py:306 forum/models.py:418
 msgid "revisions"
 msgstr "revisiones/"
 
-#: forum/models.py:448 templates/badges.html:51
+#: forum/models.py:441 templates/badges.html:51
 msgid "gold"
 msgstr "oro"
 
-#: forum/models.py:449 templates/badges.html:59
+#: forum/models.py:442 templates/badges.html:59
 msgid "silver"
 msgstr "plata"
 
-#: forum/models.py:450 templates/badges.html:66
+#: forum/models.py:443 templates/badges.html:66
 msgid "bronze"
 msgstr "bronce"
 
@@ -724,27 +706,27 @@ msgstr "preferencias del usuario"
 msgid "profile - user preferences"
 msgstr "perfil - preferencia de "
 
-#: forum/views.py:988
+#: forum/views.py:947
 #, python-format
 msgid "subscription saved, %(email)s needs validation"
 msgstr "subscripción guardada, %(email)s necesita validación"
 
-#: forum/views.py:1918
+#: forum/views.py:1860
 msgid "uploading images is limited to users with >60 reputation points"
 msgstr "para subir imagenes debes tener más de 60 puntos de reputación"
 
-#: forum/views.py:1920
+#: forum/views.py:1862
 msgid "allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'"
 msgstr ""
 "los tipos de archivos permitidos son 'jpg', 'jpeg', 'gif', 'bmp', 'png', "
 "'tiff'"
 
-#: forum/views.py:1922
+#: forum/views.py:1864
 #, python-format
 msgid "maximum upload file size is %sK"
 msgstr "tamaño máximo permitido es archivo %sK"
 
-#: forum/views.py:1924
+#: forum/views.py:1866
 #, python-format
 msgid ""
 "Error uploading file. Please contact the site administrator. Thank you. %s"
@@ -868,22 +850,22 @@ msgid "select revision"
 msgstr "seleccionar revisión"
 
 #: templates/answer_edit.html:62 templates/ask.html:94
-#: templates/question.html:468 templates/question_edit.html:91
+#: templates/question.html:467 templates/question_edit.html:91
 msgid "Toggle the real time Markdown editor preview"
 msgstr "Activar la visualización en tiempo real de Markdown"
 
 #: templates/answer_edit.html:62 templates/ask.html:94
-#: templates/question.html:468 templates/question_edit.html:91
+#: templates/question.html:467 templates/question_edit.html:91
 msgid "toggle preview"
 msgstr "Activar previsualización"
 
-#: templates/answer_edit.html:71 templates/question_edit.html:121
+#: templates/answer_edit.html:71 templates/question_edit.html:115
 #: templates/question_retag.html:73
 msgid "Save edit"
 msgstr "Guardar la edición"
 
 #: templates/answer_edit.html:72 templates/close.html:29
-#: templates/question_edit.html:122 templates/question_retag.html:74
+#: 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"
@@ -974,16 +956,15 @@ msgstr ""
 "a>. <br/> Puedes enviar tu pregunta ahora y validar tu email luego. Tu "
 "pregunta será guardada mientras tanto y publicada cuando valides tu email."
 
-#: templates/ask.html:107 templates/ask.html.py:114
-#: templates/question_edit.html:117
+#: templates/ask.html:107
 msgid "(required)"
 msgstr "(requerido)"
 
-#: templates/ask.html:121
+#: templates/ask.html:114
 msgid "Login/signup to post your question"
 msgstr "Iniciar sesión/registrarse para publicar su pregunta"
 
-#: templates/ask.html:123
+#: templates/ask.html:116
 msgid "Ask your question"
 msgstr "Haz tu pregunta"
 
@@ -999,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:73
+#: templates/badges.html:17 templates/user_stats.html:115
 msgid "Badges"
 msgstr "Distinciones"
 
@@ -1100,17 +1081,17 @@ msgid "ask the author"
 msgstr "preguntar al autor"
 
 #: templates/book.html:88 templates/book.html.py:93
-#: templates/users_questions.html:18
+#: 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/users_questions.html:11 templates/users_questions.html.py:18
+#: templates/users_questions.html:11 templates/users_questions.html.py:17
 msgid "number of times"
 msgstr "numero de veces"
 
 #: templates/book.html:105 templates/index.html:48 templates/questions.html:46
-#: templates/unanswered.html:37 templates/users_questions.html:32
+#: templates/unanswered.html:37 templates/users_questions.html:30
 msgid "votes"
 msgstr "votos"
 
@@ -1119,14 +1100,14 @@ msgid "the answer has been accepted to be correct"
 msgstr "la respuesta ha sido aceptada como correcta"
 
 #: templates/book.html:115 templates/index.html:49 templates/questions.html:47
-#: templates/unanswered.html:38 templates/users_questions.html:42
+#: templates/unanswered.html:38 templates/users_questions.html:40
 msgid "views"
 msgstr "vistas"
 
-#: templates/book.html:125 templates/index.html:69 templates/question.html:500
-#: templates/questions.html:84 templates/questions.html.py:157
+#: 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:54
+#: templates/unanswered.html.py:106 templates/users_questions.html:52
 msgid "using tags"
 msgstr "usando etiquetas"
 
@@ -1138,23 +1119,6 @@ msgstr "suscribirse al RSS del libro"
 msgid "subscribe to the questions feed"
 msgstr "suscribirse al agregado de noticias"
 
-#: templates/categories.html:6 templates/categories.html.py:29
-msgid "Category list"
-msgstr "Lista de Categorías"
-
-#: templates/categories.html:34 templates/tags.html:42
-msgid "Nothing found"
-msgstr "Nada encontrado"
-
-#: templates/categories.html:40
-#, fuzzy
-msgid "see questions that matches"
-msgstr "ver preguntas etiquetadas"
-
-#: templates/categories.html:40
-msgid "category "
-msgstr "categoría"
-
 #: templates/close.html:6 templates/close.html.py:16
 msgid "Close question"
 msgstr "Cerrar pregunta"
@@ -1514,14 +1478,14 @@ msgid "all questions"
 msgstr "todas las preguntas"
 
 #: templates/index.html:47 templates/questions.html:45
-#: templates/unanswered.html:36 templates/users_questions.html:37
+#: templates/unanswered.html:36 templates/users_questions.html:35
 msgid "answers"
 msgstr "respuestas"
 
-#: templates/index.html:69 templates/question.html:500
-#: templates/questions.html:84 templates/questions.html.py:157
+#: 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:54
+#: templates/unanswered.html.py:106 templates/users_questions.html:52
 msgid "see questions tagged"
 msgstr "ver preguntas etiquetadas"
 
@@ -1668,7 +1632,7 @@ msgid "i like this post (click again to cancel)"
 msgstr "Me gusta esta entrada (clickear devuelta para cancelar)"
 
 #: templates/question.html:75 templates/question.html.py:89
-#: templates/question.html:290
+#: templates/question.html:289
 msgid "current number of votes"
 msgstr "número actual de votos"
 
@@ -1687,171 +1651,169 @@ msgstr ""
 "remover marca de favorito a esta pregunta (clickear devuelta para volver a "
 "marcar)"
 
-#: templates/question.html:128 templates/questions.html:87
-msgid "Category: "
-msgstr "Categoría: "
-
-#: templates/question.html:135 templates/question.html.py:323
+#: templates/question.html:134 templates/question.html.py:322
 #: templates/revisions_answer.html:53 templates/revisions_question.html:53
 msgid "edit"
 msgstr "editar"
 
-#: templates/question.html:139 templates/question.html.py:333
+#: templates/question.html:138 templates/question.html.py:332
 msgid "delete"
 msgstr "borrar"
 
-#: templates/question.html:144
+#: templates/question.html:143
 msgid "reopen"
 msgstr "re-abrir"
 
-#: templates/question.html:149
+#: templates/question.html:148
 msgid "close"
 msgstr "cerrar"
 
-#: templates/question.html:155 templates/question.html.py:346
+#: templates/question.html:154 templates/question.html.py:345
 msgid ""
 "report as offensive (i.e containing spam, advertising, malicious text, etc.)"
 msgstr ""
 "reportar como ofensivo (ej. contiene spam, publicidad, texto malicioso, etc.)"
 
-#: templates/question.html:156 templates/question.html.py:347
+#: templates/question.html:155 templates/question.html.py:346
 msgid "flag offensive"
 msgstr "marcar como ofensivo"
 
-#: templates/question.html:168 templates/question.html.py:356
+#: templates/question.html:167 templates/question.html.py:355
 #: templates/revisions_answer.html:65 templates/revisions_question.html:65
 msgid "updated"
 msgstr "actualizado"
 
-#: templates/question.html:217 templates/question.html.py:403
+#: templates/question.html:216 templates/question.html.py:402
 #: templates/revisions_answer.html:63 templates/revisions_question.html:63
 msgid "asked"
 msgstr "preguntado"
 
-#: templates/question.html:247 templates/question.html.py:430
+#: templates/question.html:246 templates/question.html.py:429
 msgid "comments"
 msgstr "comentarios"
 
-#: templates/question.html:248 templates/question.html.py:431
+#: templates/question.html:247 templates/question.html.py:430
 msgid "add comment"
 msgstr "agregar comentario"
 
-#: templates/question.html:261
-msgid "The question has been closed for the following reason"
-msgstr "La pregunta fue cerrada por el siguiente motivo "
-
-#: templates/question.html:261
-msgid "by"
-msgstr "por"
+#: templates/question.html:260
+#, python-format
+msgid ""
+"The question has been closed for the following reason \"%(question."
+"get_close_reason_display)s\" by"
+msgstr ""
+"La pregunta ha sido cerrada por el siguiente motivo \"%(question."
+"get_close_reason_display)s\" por"
 
-#: templates/question.html:263
-msgid "close date "
-msgstr "fecha de cierre"
+#: templates/question.html:262
+#, python-format
+msgid "close date %(question.closed_at)s"
+msgstr "fecha de cerrada %(question.closed_at)s"
 
-#: templates/question.html:270 templates/user_stats.html:13
+#: templates/question.html:269 templates/user_stats.html:28
 msgid "Answers"
 msgstr "Respuestas"
 
-#: templates/question.html:272
+#: templates/question.html:271
 msgid "oldest answers will be shown first"
 msgstr "la respuesta mas vieja será mostrada primero"
 
-#: templates/question.html:272
+#: templates/question.html:271
 msgid "oldest answers"
 msgstr "pregunta más vieja"
 
-#: templates/question.html:273
+#: templates/question.html:272
 msgid "newest answers will be shown first"
 msgstr "preguntas más nuevas serán mostradas primero"
 
-#: templates/question.html:273
+#: templates/question.html:272
 msgid "newest answers"
 msgstr "más nuevas"
 
-#: templates/question.html:274
+#: templates/question.html:273
 msgid "most voted answers will be shown first"
 msgstr "las preguntas más votadas serán mostradas primero"
 
-#: templates/question.html:274
+#: templates/question.html:273
 msgid "popular answers"
 msgstr "respuestas populares"
 
-#: templates/question.html:288 templates/question.html.py:289
+#: templates/question.html:287 templates/question.html.py:288
 msgid "i like this answer (click again to cancel)"
 msgstr "me gusta esta respuesta (clickear devuelta para cancelar)"
 
-#: templates/question.html:295 templates/question.html.py:296
+#: templates/question.html:294 templates/question.html.py:295
 msgid "i dont like this answer (click again to cancel)"
 msgstr "no me gusta esta respuesta (clickear devuelta para cancelar)"
 
-#: templates/question.html:301 templates/question.html.py:302
+#: templates/question.html:300 templates/question.html.py:301
 msgid "mark this answer as favorite (click again to undo)"
 msgstr "marcar esta respuesta como favorita (clickear devuelta para deshacer)"
 
-#: templates/question.html:307 templates/question.html.py:308
+#: templates/question.html:306 templates/question.html.py:307
 msgid "the author of the question has selected this answer as correct"
 msgstr "el autor de esta pregunta ha seleccionado esta respuesta como correcta"
 
-#: templates/question.html:330
+#: templates/question.html:329
 msgid "undelete"
 msgstr "deshacer eliminar"
 
-#: templates/question.html:340
+#: templates/question.html:339
 msgid "answer permanent link"
 msgstr "enlace permanente a respuesta"
 
-#: templates/question.html:341
+#: templates/question.html:340
 msgid "permanent link"
 msgstr "enlace permanente"
 
-#: templates/question.html:454
+#: templates/question.html:453
 msgid "Your answer"
 msgstr "Tu respuesta"
 
-#: templates/question.html:457
+#: templates/question.html:456
 msgid "you can answer anonymously and then login"
 msgstr "puedes responder de forma anónima y luego ingresar"
 
-#: templates/question.html:480
+#: templates/question.html:479
 msgid "Answer the question"
 msgstr "Responde la pregunta"
 
-#: templates/question.html:482
+#: templates/question.html:481
 msgid "Notify me daily if there are any new answers."
 msgstr "Notificarme diariamente si hay nuevas respuestas."
 
-#: templates/question.html:484
+#: templates/question.html:483
 msgid "once you sign in you will be able to subscribe for any updates here"
 msgstr ""
 "una vez que hayas ingresado podrás suscribirte a cualquiera de las "
 "actualizaciones aquí."
 
-#: templates/question.html:495
+#: templates/question.html:494
 msgid "Question tags"
 msgstr "Tags de la pregunta"
 
-#: templates/question.html:505
+#: templates/question.html:504
 msgid "question asked"
 msgstr "pregunta preguntada"
 
-#: templates/question.html:505 templates/question.html.py:511
+#: templates/question.html:504 templates/question.html.py:510
 #: templates/user_info.html:51
 msgid "ago"
 msgstr " atras"
 
-#: templates/question.html:508
+#: templates/question.html:507
 msgid "question was seen"
 msgstr "la pregunta fue vista"
 
-#: templates/question.html:508
+#: templates/question.html:507
 msgid "times"
 msgstr "veces"
 
-#: templates/question.html:511
+#: templates/question.html:510
 msgid "last updated"
 msgstr "última vez actualizada"
 
-#: templates/question.html:516
+#: templates/question.html:515
 msgid "Related questions"
 msgstr "Preguntas relacionadas"
 
@@ -1916,7 +1878,7 @@ msgstr "preguntas actualizadas más recientemente"
 msgid "active"
 msgstr "actividad"
 
-#: templates/questions.html:110
+#: templates/questions.html:109
 #, python-format
 msgid ""
 "\n"
@@ -1935,7 +1897,7 @@ msgstr[1] ""
 "\t\t\ttiene un total de %(q_num)s preguntas etiquetadas con %(tagname)s\n"
 "\t\t\t"
 
-#: templates/questions.html:117
+#: templates/questions.html:116
 #, python-format
 msgid ""
 "\n"
@@ -1954,7 +1916,7 @@ msgstr[1] ""
 "\t\t\thay un total de %(q_num)s pregunta que contiene %(searchtitle)s\n"
 "\t\t\t"
 
-#: templates/questions.html:123
+#: templates/questions.html:122
 #, fuzzy, python-format
 msgid ""
 "\n"
@@ -1967,36 +1929,36 @@ msgid_plural ""
 msgstr[0] "ver preguntas etiquetadas '%(tagname)s'"
 msgstr[1] "ver pregunta etiquetada '%(tagname)s'"
 
-#: templates/questions.html:132
+#: templates/questions.html:131
 msgid "latest questions info"
 msgstr "<strong>Más recientes</strong> preguntas son mostradas primero."
 
-#: templates/questions.html:136
+#: templates/questions.html:135
 msgid "Questions are sorted by the <strong>time of last update</strong>."
 msgstr ""
 "Las preguntas estan ordenadas por <strong>fecha de último update</strong>."
 
-#: templates/questions.html:137
+#: templates/questions.html:136
 msgid "Most recently answered ones are shown first."
 msgstr "Las más recientemente respondidas son mostradas primero."
 
-#: templates/questions.html:141
+#: templates/questions.html:140
 msgid "Questions sorted by <strong>number of responses</strong>."
 msgstr "Preguntas ordenadas por <strong>número de respuestas</strong>."
 
-#: templates/questions.html:142
+#: templates/questions.html:141
 msgid "Most answered questions are shown first."
 msgstr "Preguntas más respondidas aparecen primero."
 
-#: templates/questions.html:146
+#: templates/questions.html:145
 msgid "Questions are sorted by the <strong>number of votes</strong>."
 msgstr "Las preguntas son ordenadas por el <strong>número de votos</strong>."
 
-#: templates/questions.html:147
+#: templates/questions.html:146
 msgid "Most voted questions are shown first."
 msgstr "Las preguntas más votadas son mostradas primero."
 
-#: templates/questions.html:154 templates/unanswered.html:102
+#: templates/questions.html:153 templates/unanswered.html:102
 msgid "Related tags"
 msgstr "Etiquetas relacionadas"
 
@@ -2061,6 +2023,10 @@ msgstr "Todas las etiquetas que coincidan con la busqueda"
 msgid "all tags - make this empty in english"
 msgstr "todas las tags"
 
+#: templates/tags.html:42
+msgid "Nothing found"
+msgstr "Nada encontrado"
+
 #: templates/unanswered.html:7 templates/unanswered.html.py:18
 msgid "Unanswered questions"
 msgstr "Preguntas sin respuesta"
@@ -2160,50 +2126,41 @@ msgstr "Enviar mis respuestas a Twitter"
 msgid "Save"
 msgstr "Guardar"
 
-#: templates/user_stats.html:10
+#: templates/user_stats.html:16
 msgid "User questions"
 msgstr "Preguntas del usuario"
 
-#: templates/user_stats.html:20
+#: templates/user_stats.html:38
 #, python-format
 msgid "the answer has been voted for %(vote_count)s times"
 msgstr "la respuesta ha sido votada %(vote_count)s veces"
 
-#: templates/user_stats.html:20
+#: templates/user_stats.html:38
 msgid "this answer has been selected as correct"
 msgstr "esta respuesta ha sido seleccionada como correcta"
 
-#: templates/user_stats.html:28
+#: templates/user_stats.html:46
 #, python-format
 msgid "the answer has been commented %(comment_count)s times"
 msgstr "la respuesta ha sido comentada %(comment_count)s veces"
 
-#: templates/user_stats.html:36
-#, fuzzy
-msgid "Votes"
-msgstr "votos"
-
-#: templates/user_stats.html:41
-msgid "thumb up"
-msgstr ""
+#: templates/user_stats.html:60
+msgid "votes total"
+msgstr "votos totales"
 
-#: templates/user_stats.html:42
+#: 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:46
-msgid "thumb down"
-msgstr ""
-
-#: templates/user_stats.html:47
+#: 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:54
+#: templates/user_stats.html:87
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: templates/user_stats.html:61
+#: templates/user_stats.html:97
 #, python-format
 msgid "see other questions tagged '%(tag)s' "
 msgstr "ver otras preguntas etiqueteadas '%(tag)s'"
@@ -2220,11 +2177,6 @@ msgstr "gráfica de la reputación del usuario"
 msgid "reputation history"
 msgstr "historial de reputación"
 
-#: templates/user_tabs.html:23
-#, fuzzy
-msgid "questions that user selected as his/her favorite"
-msgstr "esta pregunta ha sido seleccionada como favorita"
-
 #: templates/user_tabs.html:24
 msgid "favorites"
 msgstr "favoritos"
@@ -2262,15 +2214,7 @@ msgstr "Nada encontrado."
 msgid "this questions was selected as favorite"
 msgstr "esta pregunta ha sido seleccionada como favorita"
 
-#: templates/users_questions.html:12
-msgid "thumb-up on"
-msgstr ""
-
-#: templates/users_questions.html:19
-msgid "thumb-up off"
-msgstr ""
-
-#: templates/users_questions.html:35
+#: templates/users_questions.html:33
 msgid "this answer has been accepted to be correct"
 msgstr "esta respuesta ha sido aceptada como correcta"
 
@@ -2296,7 +2240,7 @@ msgid "Your new Email"
 msgstr "Tu nuevo Email"
 
 #: templates/authopenid/changeemail.html:31
-#: templates/authopenid/signin.html:137
+#: templates/authopenid/signin.html:136
 msgid "Password"
 msgstr "Contraseña"
 
@@ -2404,7 +2348,7 @@ msgid "This account already exists, please use another."
 msgstr "Esta cuenta ya existe, por favor usar otra."
 
 #: templates/authopenid/complete.html:19 templates/authopenid/complete.html:32
-#: templates/authopenid/sendpw.html:16 templates/authopenid/signin.html:121
+#: templates/authopenid/signin.html:120
 msgid "Sorry, looks like we have some errors:"
 msgstr "Ups, parece que hay errores:"
 
@@ -2436,10 +2380,40 @@ msgstr "contraseña"
 msgid "Register"
 msgstr "Registrarse"
 
-#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:139
+#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:138
 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"
@@ -2456,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."
@@ -2476,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"
@@ -2512,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."
@@ -2580,7 +2589,7 @@ msgstr ""
 "Ingresa tu dirección (URL) de <a class=\"openid_logo\" href=\"http://openid."
 "net\">OpenID</a>"
 
-#: templates/authopenid/signin.html:112 templates/authopenid/signin.html:138
+#: templates/authopenid/signin.html:112 templates/authopenid/signin.html:137
 msgid "Login"
 msgstr "Ingresar"
 
@@ -2588,48 +2597,48 @@ msgstr "Ingresar"
 msgid "we support two login modes"
 msgstr "soportamos dos tipos de ingreso"
 
-#: templates/authopenid/signin.html:135
+#: templates/authopenid/signin.html:134
 msgid "Use login name and password"
 msgstr "Nombre de usuario y contraseña"
 
-#: templates/authopenid/signin.html:136
+#: templates/authopenid/signin.html:135
 msgid "Login name"
 msgstr "Nombre de usuario"
 
-#: templates/authopenid/signin.html:140
+#: templates/authopenid/signin.html:139
 msgid "Create new account"
 msgstr "Crear cuenta nueva"
 
-#: templates/authopenid/signin.html:149
+#: templates/authopenid/signin.html:148
 msgid "Why use OpenID?"
 msgstr "¿Porqué usar OpenID?"
 
-#: templates/authopenid/signin.html:152
+#: templates/authopenid/signin.html:151
 msgid "with openid it is easier"
 msgstr "Con OpenID no necesitas crear un nuevo nombre de usuario y contraseña."
 
-#: templates/authopenid/signin.html:155
+#: templates/authopenid/signin.html:154
 msgid "reuse openid"
 msgstr ""
 "Puedes de forma segura re-usar el mismo nombre de usuario para todos los "
 "sitios que acepten OpenID."
 
-#: templates/authopenid/signin.html:158
+#: templates/authopenid/signin.html:157
 msgid "openid is widely adopted"
 msgstr ""
 "OpenID es extensamente usado. Hay más de 160,000,000 cuentas de OpenID en "
 "uso en el mundo. Mas de 10,000 sitios aceptan OpenID."
 
-#: templates/authopenid/signin.html:161
+#: templates/authopenid/signin.html:160
 msgid "openid is supported open standard"
 msgstr ""
 "OpenID es basado en un standard abierto, apoyado por muchas organizaciones."
 
-#: templates/authopenid/signin.html:166
+#: templates/authopenid/signin.html:165
 msgid "Find out more"
 msgstr "Averigua más"
 
-#: templates/authopenid/signin.html:167
+#: templates/authopenid/signin.html:166
 msgid "Get OpenID"
 msgstr "Adquiere una OpenID"
 
@@ -2673,20 +2682,6 @@ msgstr "Registrate con tu OpenID"
 msgid "Login with your OpenID"
 msgstr "Ingresar con tu OpenID"
 
-#, fuzzy
-#~ msgid "complete list of quesionts"
-#~ msgstr "lista completa de preguntas"
-
-#~ msgid "votes total"
-#~ msgstr "votos totales"
-
-#~ msgid "Username:"
-#~ msgstr "Nombre de usuario:"
-
-#, fuzzy
-#~ msgid "New password:"
-#~ msgstr "Nueva contraseña:"
-
 #~ msgid "site title"
 #~ msgstr "Preguntalo.com.uy"