added anonymous posting, per-question subscription and fixes by Pothers and some more, see development.log

6 files changed, 1746 insertions, 1391 deletions

diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
deleted file mode 100644
index a4dd5554..00000000
--- a/locale/en/LC_MESSAGES/django.mo
+++ /dev/null
diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index c4c1e674..cc42454c 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-06-22 20:40-0400\n"
+"POT-Creation-Date: 2009-08-05 22:26-0400\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,19 +16,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: settings.py:32
+#: settings.py:12
 msgid "account/"
 msgstr ""
 
-#: settings.py:32 django_authopenid/urls.py:9 django_authopenid/urls.py:11
+#: settings.py:12 django_authopenid/urls.py:9 django_authopenid/urls.py:10
+#: django_authopenid/urls.py:11 django_authopenid/urls.py:13
+#: forum/views.py:304 templates/authopenid/confirm_email.txt:10
 msgid "signin/"
 msgstr ""
 
-#: django_authopenid/forms.py:67 django_authopenid/views.py:93
+#: django_authopenid/forms.py:67 django_authopenid/views.py:102
 msgid "i-names are not supported"
 msgstr ""
 
-#: django_authopenid/forms.py:102 django_authopenid/forms.py:207
+#: django_authopenid/forms.py:102
 msgid ""
 "Usernames can only contain                     letters, numbers and "
 "underscores"
@@ -40,19 +42,19 @@ msgid ""
 "choose another."
 msgstr ""
 
-#: django_authopenid/forms.py:126 django_authopenid/forms.py:231
+#: 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."
 msgstr ""
 
-#: django_authopenid/forms.py:130 django_authopenid/forms.py:235
+#: django_authopenid/forms.py:130 django_authopenid/forms.py:237
 msgid "This account is inactive."
 msgstr ""
 
-#: django_authopenid/forms.py:158
+#: django_authopenid/forms.py:158 django_authopenid/forms.py:210
 msgid "invalid user name"
-msgstr ""
+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"
@@ -66,137 +68,147 @@ msgstr ""
 msgid "this name is already in use - please try anoter"
 msgstr ""
 
-#: django_authopenid/forms.py:184
+#: django_authopenid/forms.py:185
 msgid ""
-"This email is already                 registered in our database. Please "
-"choose another."
+"This email is already                         registered in our database. "
+"Please choose another."
 msgstr ""
 
-#: django_authopenid/forms.py:214
+#: django_authopenid/forms.py:216
 msgid ""
 "This username don't exist.                         Please choose another."
 msgstr ""
 
-#: django_authopenid/forms.py:253
+#: django_authopenid/forms.py:255
 msgid "choose a username"
 msgstr ""
 
-#: django_authopenid/forms.py:255 templates/authopenid/signup.html:36
+#: django_authopenid/forms.py:257 templates/authopenid/signup.html:38
 msgid "your email address"
 msgstr ""
 
-#: django_authopenid/forms.py:257 templates/authopenid/signup.html:37
+#: django_authopenid/forms.py:259 templates/authopenid/signup.html:39
 msgid "choose password"
 msgstr ""
 
-#: django_authopenid/forms.py:259 templates/authopenid/signup.html:38
+#: django_authopenid/forms.py:261 templates/authopenid/signup.html:40
 msgid "retype password"
 msgstr ""
 
-#: django_authopenid/forms.py:330
+#: django_authopenid/forms.py:335
 msgid ""
 "Old password is incorrect.                     Please enter the correct "
 "password."
 msgstr ""
 
-#: django_authopenid/forms.py:342
+#: django_authopenid/forms.py:347
 msgid "new passwords do not match"
 msgstr ""
 
-#: django_authopenid/forms.py:434
+#: django_authopenid/forms.py:442
 msgid "Incorrect username."
 msgstr ""
 
 #: django_authopenid/urls.py:10
-msgid "signout/"
+msgid "newquestion/"
 msgstr ""
 
 #: django_authopenid/urls.py:11
-msgid "complete/"
+msgid "newanswer/"
+msgstr ""
+
+#: django_authopenid/urls.py:12
+msgid "signout/"
 msgstr ""
 
 #: django_authopenid/urls.py:13
+msgid "complete/"
+msgstr ""
+
+#: django_authopenid/urls.py:15
 msgid "register/"
 msgstr ""
 
-#: django_authopenid/urls.py:14
+#: django_authopenid/urls.py:16
 msgid "signup/"
 msgstr ""
 
-#: django_authopenid/urls.py:16
+#: django_authopenid/urls.py:18
 msgid "sendpw/"
 msgstr ""
 
-#: django_authopenid/urls.py:26
+#: django_authopenid/urls.py:29
 msgid "delete/"
 msgstr ""
 
-#: django_authopenid/views.py:99
+#: django_authopenid/views.py:108
 #, python-format
-msgid "非法OpenID地址： %s"
+msgid "OpenID %(openid_url)s is invalid"
 msgstr ""
 
-#: django_authopenid/views.py:366
+#: django_authopenid/views.py:417 django_authopenid/views.py:544
 msgid "Welcome"
-msgstr ""
+msgstr "Verification Email from NMR Wiki Q&A"
 
-#: django_authopenid/views.py:456
+#: django_authopenid/views.py:507
 msgid "Password changed."
 msgstr ""
 
-#: django_authopenid/views.py:488
-msgid "Email changed."
+#: django_authopenid/views.py:519 django_authopenid/views.py:524
+msgid "your email needs to be validated"
 msgstr ""
+"Your email needs to be validated. Please see details <a "
+"id='validate_email_alert' href=\"/faq#validate\">here</a>."
 
-#: django_authopenid/views.py:519 django_authopenid/views.py:671
+#: django_authopenid/views.py:681 django_authopenid/views.py:833
 #, python-format
 msgid "No OpenID %s found associated in our database"
 msgstr ""
 
-#: django_authopenid/views.py:523 django_authopenid/views.py:678
+#: django_authopenid/views.py:685 django_authopenid/views.py:840
 #, python-format
 msgid "The OpenID %s isn't associated to current user logged in"
 msgstr ""
 
-#: django_authopenid/views.py:531
+#: django_authopenid/views.py:693
 msgid "Email Changed."
 msgstr ""
 
-#: django_authopenid/views.py:606
+#: django_authopenid/views.py:768
 msgid "This OpenID is already associated with another account."
 msgstr ""
 
-#: django_authopenid/views.py:611
+#: django_authopenid/views.py:773
 #, python-format
 msgid "OpenID %s is now associated with your account."
 msgstr ""
 
-#: django_authopenid/views.py:681
+#: django_authopenid/views.py:843
 msgid "Account deleted."
 msgstr ""
 
-#: django_authopenid/views.py:721
+#: django_authopenid/views.py:883
 msgid "Request for new password"
 msgstr ""
 
-#: django_authopenid/views.py:734
+#: django_authopenid/views.py:896
 msgid "A new password has been sent to your email address."
 msgstr ""
 
-#: django_authopenid/views.py:764
+#: django_authopenid/views.py:926
 #, python-format
 msgid ""
 "Could not change password. Confirmation key '%s'                is not "
 "registered."
 msgstr ""
 
-#: django_authopenid/views.py:773
+#: django_authopenid/views.py:935
 msgid ""
 "Can not change password. User don't exist anymore                 in our "
 "database."
 msgstr ""
 
-#: django_authopenid/views.py:782
+#: django_authopenid/views.py:944
 #, python-format
 msgid "Password changed for %s. You may now sign in."
 msgstr ""
@@ -237,7 +249,7 @@ msgstr ""
 msgid "question"
 msgstr ""
 
-#: forum/const.py:57 templates/book.html:110 templates/backup/book.html:110
+#: forum/const.py:57 templates/book.html:110
 msgid "answer"
 msgstr ""
 
@@ -259,7 +271,7 @@ msgstr ""
 
 #: forum/const.py:62
 msgid "received award"
-msgstr ""
+msgstr "received badge"
 
 #: forum/const.py:63
 msgid "marked best answer"
@@ -317,43 +329,21 @@ msgstr ""
 msgid "retagged"
 msgstr ""
 
-#: forum/feed.py:17 templates/base.html:7 templates/base_content.html:6
-#: templates/faq.html:25 templates/faq.html.py:108
-#: templates/backup/base.html:7 templates/backup/base_content.html:6
-#: templates/backup/faq.html:25 templates/backup/faq.html.py:108
-#: templates/tough/faq.html:23 templates/tough/faq.html.py:106
-#: templates/tough/question_retag.html:89
-msgid "site title"
-msgstr ""
-
-#: forum/feed.py:17
+#: forum/feed.py:18
 msgid " - "
 msgstr ""
 
-#: forum/feed.py:17 templates/base.html:7 templates/base_content.html:6
-#: templates/backup/base.html:7 templates/backup/base_content.html:6
-msgid "site slogan"
-msgstr ""
-
-#: forum/feed.py:17
+#: forum/feed.py:18
 msgid "latest questions"
 msgstr ""
 
-#: forum/feed.py:19 templates/index.html:8 templates/backup/index.html:8
-msgid "meta site content"
-msgstr ""
-
-#: forum/feed.py:21
-msgid "copyright message"
+#: forum/feed.py:19
+msgid "questions/"
 msgstr ""
 
 #: forum/forms.py:14 templates/answer_edit_tips.html:34
-#: templates/answer_edit_tips.html.py:39 templates/question_edit_tips.html:31
+#: templates/answer_edit_tips.html.py:38 templates/question_edit_tips.html:31
 #: templates/question_edit_tips.html:36
-#: templates/backup/answer_edit_tips.html:33
-#: templates/backup/answer_edit_tips.html:38
-#: templates/backup/question_edit_tips.html:29
-#: templates/backup/question_edit_tips.html:34
 msgid "title"
 msgstr ""
 
@@ -374,108 +364,125 @@ msgid "question content must be > 10 characters"
 msgstr ""
 
 #: forum/forms.py:45 templates/header.html:30 templates/header.html.py:61
-#: templates/backup/header.html:30 templates/backup/header.html.py:59
 msgid "tags"
 msgstr ""
 
-#: forum/forms.py:46
-msgid "please use space to separate tags (this enables autocomplete feature)"
+#: forum/forms.py:47
+msgid ""
+"Tags are short keywords, with no spaces within. Up to five tags can be used."
 msgstr ""
 
-#: forum/forms.py:53
+#: forum/forms.py:54 templates/question_retag.html:38
 msgid "tags are required"
 msgstr ""
 
-#: forum/forms.py:57
+#: forum/forms.py:58
 msgid "please use 5 tags or less"
 msgstr ""
 
-#: forum/forms.py:60
+#: forum/forms.py:61
 msgid "tags must be shorter than 20 characters"
 msgstr ""
 
-#: forum/forms.py:64
+#: forum/forms.py:65
 msgid ""
 "please use following characters in tags: letters 'a-z', numbers, and "
 "characters '.-_#'"
 msgstr ""
 
-#: forum/forms.py:74 templates/index.html:56 templates/question.html:196
-#: templates/question.html.py:377 templates/questions.html:58
+#: forum/forms.py:75 templates/index.html:57 templates/question.html:199
+#: templates/question.html.py:380 templates/questions.html:58
 #: templates/questions.html.py:70 templates/unanswered.html:48
-#: templates/unanswered.html.py:60 templates/backup/index.html:56
-#: templates/backup/question.html:195 templates/backup/question.html.py:367
-#: templates/backup/questions.html:57 templates/backup/questions.html.py:69
-#: templates/backup/unanswered.html:47 templates/backup/unanswered.html:59
-#: templates/tough/unanswered.html:46 templates/tough/unanswered.html.py:58
+#: templates/unanswered.html.py:60
 msgid "community wiki"
 msgstr ""
 
-#: forum/forms.py:75
+#: forum/forms.py:76
 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:84
+#: forum/forms.py:89
 msgid "update summary:"
 msgstr ""
 
-#: forum/forms.py:85
+#: forum/forms.py:90
 msgid ""
 "enter a brief summary of your revision (e.g. fixed spelling, grammar, "
 "improved style, this field is optional)"
 msgstr ""
 
-#: forum/forms.py:160
+#: forum/forms.py:175
 msgid "this email does not have to be linked to gravatar"
 msgstr ""
 
-#: forum/forms.py:161
+#: forum/forms.py:176
 msgid "Real name"
 msgstr ""
 
-#: forum/forms.py:162
+#: forum/forms.py:177
 msgid "Website"
 msgstr ""
 
-#: forum/forms.py:163
+#: forum/forms.py:178
 msgid "Location"
 msgstr ""
 
-#: forum/forms.py:164
+#: forum/forms.py:179
 msgid "Date of birth"
 msgstr ""
 
-#: forum/forms.py:164
+#: forum/forms.py:179
 msgid "will not be shown, used to calculate age, format: YYYY-MM-DD"
 msgstr ""
 
-#: forum/forms.py:165 templates/authopenid/settings.html:20
+#: forum/forms.py:180 templates/authopenid/settings.html:21
 msgid "Profile"
 msgstr ""
 
-#: forum/forms.py:190 forum/forms.py:191
+#: forum/forms.py:207 forum/forms.py:208
 msgid "this email has already been registered, please use another one"
 msgstr ""
 
-#: forum/models.py:316 templates/badges.html:52
-#: templates/backup/badges.html:52
+#: forum/models.py:238
+#, python-format
+msgid "%(author)s modified the question"
+msgstr ""
+
+#: forum/models.py:242
+#, python-format
+msgid "%(people)s posted %(new_answer_count)s new answers"
+msgstr ""
+
+#: forum/models.py:247
+#, python-format
+msgid "%(people)s commented the question"
+msgstr ""
+
+#: forum/models.py:252
+#, python-format
+msgid "%(people)s commented answers"
+msgstr ""
+
+#: forum/models.py:254
+#, python-format
+msgid "%(people)s commented the answer"
+msgstr ""
+
+#: forum/models.py:433 templates/badges.html:52
 msgid "gold"
 msgstr ""
 
-#: forum/models.py:317 templates/badges.html:62
-#: templates/backup/badges.html:62
+#: forum/models.py:434 templates/badges.html:60
 msgid "silver"
 msgstr ""
 
-#: forum/models.py:318 templates/badges.html:70
-#: templates/backup/badges.html:70
+#: forum/models.py:435 templates/badges.html:67
 msgid "bronze"
 msgstr ""
 
 #: forum/user.py:16 templates/user_tabs.html:7
-#: templates/backup/user_tabs.html:6
 msgid "overview"
 msgstr ""
 
@@ -488,7 +495,6 @@ msgid "user profile overview"
 msgstr ""
 
 #: forum/user.py:24 templates/user_tabs.html:9
-#: templates/backup/user_tabs.html:8
 msgid "recent activity"
 msgstr ""
 
@@ -501,12 +507,10 @@ msgid "profile - recent activity"
 msgstr ""
 
 #: forum/user.py:33 templates/user_tabs.html:13
-#: templates/backup/user_tabs.html:12
 msgid "responses"
 msgstr ""
 
 #: forum/user.py:34 templates/user_tabs.html:12
-#: templates/backup/user_tabs.html:11
 msgid "comments and answers to others questions"
 msgstr ""
 
@@ -515,7 +519,6 @@ msgid "profile - responses"
 msgstr ""
 
 #: forum/user.py:42 templates/user_info.html:23 templates/users.html:26
-#: templates/backup/user_info.html:22 templates/backup/users.html:25
 msgid "reputation"
 msgstr ""
 
@@ -540,12 +543,10 @@ msgid "profile - favorite questions"
 msgstr ""
 
 #: forum/user.py:59 templates/user_tabs.html:20
-#: templates/backup/user_tabs.html:19
 msgid "casted votes"
 msgstr "votes"
 
 #: forum/user.py:60 templates/user_tabs.html:20
-#: templates/backup/user_tabs.html:19
 msgid "user vote record"
 msgstr ""
 
@@ -557,8 +558,7 @@ msgstr ""
 msgid "preferences"
 msgstr ""
 
-#: forum/user.py:69 templates/user_tabs.html:28
-#: templates/backup/user_tabs.html:27
+#: forum/user.py:69 templates/user_tabs.html:27
 msgid "user preference settings"
 msgstr ""
 
@@ -566,27 +566,42 @@ msgstr ""
 msgid "profile - user preferences"
 msgstr ""
 
-#: forum/views.py:1730
+#: forum/views.py:304
+msgid "/account/"
+msgstr ""
+
+#: forum/views.py:943
+#, python-format
+msgid "subscription saved, %(email)s needs validation"
+msgstr ""
+"Your subscription is saved, but email address %(email)s needs to be "
+"validated, please see <a href='/faq#validate'>more details here</a>"
+
+#: forum/views.py:1853
 msgid "uploading images is limited to users with >60 reputation points"
 msgstr ""
 
-#: forum/views.py:1732
+#: forum/views.py:1855
 msgid "allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'"
 msgstr ""
 
-#: forum/views.py:1734
+#: forum/views.py:1857
 #, python-format
 msgid "maximum upload file size is %sK"
 msgstr ""
 
-#: forum/views.py:1736
+#: forum/views.py:1859
 #, 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 ""
+
 #: forum/templatetags/extra_tags.py:139 forum/templatetags/extra_tags.py:168
-#: templates/header.html:33 templates/backup/header.html:33
+#: templates/header.html:33
 msgid "badges"
 msgstr ""
 
@@ -598,140 +613,121 @@ msgstr ""
 msgid " ago"
 msgstr ""
 
-#: templates/404.html:24 templates/backup/404.html:24
+#: templates/404.html:24
 msgid "Sorry, could not find the page you requested."
 msgstr ""
 
-#: templates/404.html:26 templates/backup/404.html:26
+#: templates/404.html:26
 msgid "This might have happened for the following reasons:"
 msgstr ""
 
-#: templates/404.html:28 templates/backup/404.html:28
+#: templates/404.html:28
 msgid "this question or answer has been deleted;"
 msgstr ""
 
-#: templates/404.html:29 templates/backup/404.html:29
+#: templates/404.html:29
 msgid "url has error - please check it;"
 msgstr ""
 
-#: templates/404.html:30 templates/backup/404.html:30
+#: templates/404.html:30
 msgid ""
 "the page you tried to visit is protected or you don't have sufficient "
 "points, see"
 msgstr ""
 
-#: templates/404.html:31 templates/backup/404.html:31
+#: templates/404.html:31
 msgid "if you believe this error 404 should not have occured, please"
 msgstr ""
 
-#: templates/404.html:32 templates/backup/404.html:32
+#: templates/404.html:32
 msgid "report this problem"
 msgstr ""
 
-#: templates/404.html:41 templates/500.html:27 templates/backup/404.html:41
-#: templates/backup/500.html:27
+#: templates/404.html:41 templates/500.html:27
 msgid "back to previous page"
 msgstr ""
 
-#: templates/404.html:42 templates/backup/404.html:42
+#: templates/404.html:42
 msgid "see all questions"
 msgstr ""
 
-#: templates/404.html:43 templates/backup/404.html:43
+#: templates/404.html:43
 msgid "see all tags"
 msgstr ""
 
-#: templates/500.html:24 templates/backup/500.html:24
+#: templates/500.html:22
+msgid "sorry, system error"
+msgstr ""
+
+#: templates/500.html:24
 msgid "system error log is recorded, error will be fixed as soon as possible"
 msgstr ""
 
-#: templates/500.html:25 templates/backup/500.html:25
+#: templates/500.html:25
 msgid "please report the error to the site administrators if you wish"
 msgstr ""
 
-#: templates/500.html:28 templates/backup/500.html:28
+#: templates/500.html:28
 msgid "see latest questions"
 msgstr ""
 
-#: templates/500.html:29 templates/backup/500.html:29
+#: templates/500.html:29
 msgid "see tags"
 msgstr ""
 
 #: templates/about.html:6 templates/about.html.py:11
-#: templates/backup/about.html:6 templates/backup/about.html.py:11
 msgid "About"
 msgstr ""
 
 #: templates/answer_edit.html:4 templates/answer_edit.html.py:47
-#: templates/backup/answer_edit.html:3 templates/backup/answer_edit.html:46
 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:37
-#: templates/question.html.py:40 templates/question_edit.html:27
-#: templates/backup/answer_edit.html:23 templates/backup/answer_edit.html:26
-#: templates/backup/ask.html:24 templates/backup/ask.html.py:27
-#: templates/backup/question.html:36 templates/backup/question.html.py:39
-#: templates/backup/question_edit.html:25
+#: templates/ask.html:25 templates/ask.html.py:28 templates/question.html:40
+#: templates/question.html.py:43 templates/question_edit.html:27
 msgid "hide preview"
 msgstr ""
 
 #: templates/answer_edit.html:27 templates/ask.html:28
-#: templates/question.html:40 templates/question_edit.html:27
-#: templates/backup/answer_edit.html:26 templates/backup/ask.html:27
-#: templates/backup/question.html:39 templates/backup/question_edit.html:25
+#: templates/question.html:43 templates/question_edit.html:27
 msgid "show preview"
 msgstr ""
 
 #: templates/answer_edit.html:47 templates/question_edit.html:65
-#: templates/revisions_answer.html:36 templates/revisions_question.html:36
-#: templates/backup/answer_edit.html:46 templates/backup/question_edit.html:63
-#: templates/backup/revisions_answer.html:35
-#: templates/backup/revisions_question.html:34
-#: templates/tough/question_retag.html:51
+#: templates/question_retag.html:52 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/backup/answer_edit.html:51 templates/backup/question_edit.html:68
-#: templates/backup/revisions_answer.html:46
-#: templates/backup/revisions_question.html:45
 msgid "revision"
 msgstr ""
 
 #: templates/answer_edit.html:55 templates/question_edit.html:74
-#: templates/backup/answer_edit.html:54 templates/backup/question_edit.html:72
 msgid "select revision"
 msgstr ""
 
-#: templates/answer_edit.html:62 templates/ask.html:81
-#: templates/question.html:447 templates/question_edit.html:91
-#: templates/backup/answer_edit.html:61 templates/backup/ask.html:80
-#: templates/backup/question.html:437 templates/backup/question_edit.html:89
+#: templates/answer_edit.html:62 templates/ask.html:94
+#: templates/question.html:452 templates/question_edit.html:91
 msgid "Toggle the real time Markdown editor preview"
 msgstr ""
 
-#: templates/answer_edit.html:62 templates/ask.html:81
-#: templates/question.html:447 templates/question_edit.html:91
-#: templates/backup/answer_edit.html:61 templates/backup/ask.html:80
-#: templates/backup/question.html:437 templates/backup/question_edit.html:89
+#: templates/answer_edit.html:62 templates/ask.html:94
+#: templates/question.html:452 templates/question_edit.html:91
 msgid "toggle preview"
 msgstr ""
 
 #: templates/answer_edit.html:73 templates/question_edit.html:119
-#: templates/backup/answer_edit.html:72
-#: templates/backup/question_edit.html:117
+#: templates/question_retag.html:75
 msgid "Save edit"
 msgstr ""
 
 #: templates/answer_edit.html:74 templates/close.html:29
-#: templates/question_edit.html:120 templates/reopen.html:30
-#: templates/user_edit.html:83 templates/backup/answer_edit.html:73
-#: templates/backup/close.html:29 templates/backup/question_edit.html:118
-#: templates/backup/reopen.html:28 templates/backup/user_edit.html:81
-#: templates/tough/question_retag.html:75
+#: templates/question_edit.html:120 templates/question_retag.html:76
+#: templates/reopen.html:30 templates/user_edit.html:83
+#: templates/authopenid/changeemail.html:34
 msgid "Cancel"
 msgstr ""
 
@@ -739,726 +735,613 @@ msgstr ""
 msgid "answer tips"
 msgstr "Tips"
 
-#: templates/answer_edit_tips.html:7 templates/backup/answer_edit_tips.html:6
+#: templates/answer_edit_tips.html:7
 msgid "please make your answer relevant to this community"
 msgstr ""
 
-#: templates/answer_edit_tips.html:10 templates/backup/answer_edit_tips.html:9
+#: templates/answer_edit_tips.html:10
 msgid "try to give an answer, rather than engage into a discussion"
 msgstr ""
 
 #: templates/answer_edit_tips.html:13
-#: templates/backup/answer_edit_tips.html:12
 msgid "please try to provide details"
 msgstr ""
 
 #: templates/answer_edit_tips.html:16 templates/question_edit_tips.html:13
-#: templates/backup/answer_edit_tips.html:15
-#: templates/backup/question_edit_tips.html:11
 msgid "be clear and concise"
 msgstr ""
 
 #: templates/answer_edit_tips.html:19 templates/question_edit_tips.html:16
-#: templates/backup/answer_edit_tips.html:18
-#: templates/backup/question_edit_tips.html:14
 msgid "see frequently asked questions"
 msgstr ""
 
 #: templates/answer_edit_tips.html:25 templates/question_edit_tips.html:22
-#: templates/backup/answer_edit_tips.html:24
-#: templates/backup/question_edit_tips.html:20
 msgid "Markdown tips"
 msgstr "Markdown basics"
 
 #: templates/answer_edit_tips.html:28 templates/question_edit_tips.html:25
-#: templates/backup/answer_edit_tips.html:27
-#: templates/backup/question_edit_tips.html:23
 msgid "*italic* or __italic__"
 msgstr ""
 
 #: templates/answer_edit_tips.html:31 templates/question_edit_tips.html:28
-#: templates/backup/answer_edit_tips.html:30
-#: templates/backup/question_edit_tips.html:26
 msgid "**bold** or __bold__"
 msgstr ""
 
 #: templates/answer_edit_tips.html:34 templates/question_edit_tips.html:31
-#: templates/backup/answer_edit_tips.html:33
-#: templates/backup/question_edit_tips.html:29
 msgid "link"
 msgstr ""
 
-#: templates/answer_edit_tips.html:34 templates/answer_edit_tips.html.py:39
+#: templates/answer_edit_tips.html:34 templates/answer_edit_tips.html.py:38
 #: templates/question_edit_tips.html:31 templates/question_edit_tips.html:36
-#: templates/backup/answer_edit_tips.html:33
-#: templates/backup/answer_edit_tips.html:38
-#: templates/backup/question_edit_tips.html:29
-#: templates/backup/question_edit_tips.html:34
 msgid "text"
 msgstr ""
 
-#: templates/answer_edit_tips.html:39 templates/question_edit_tips.html:36
-#: templates/backup/answer_edit_tips.html:38
-#: templates/backup/question_edit_tips.html:34
+#: templates/answer_edit_tips.html:38 templates/question_edit_tips.html:36
 msgid "image"
 msgstr ""
 
-#: templates/answer_edit_tips.html:43 templates/question_edit_tips.html:40
-#: templates/backup/answer_edit_tips.html:42
-#: templates/backup/question_edit_tips.html:38
+#: templates/answer_edit_tips.html:42 templates/question_edit_tips.html:40
 msgid "numbered list:"
 msgstr ""
 
-#: templates/answer_edit_tips.html:48 templates/question_edit_tips.html:45
-#: templates/backup/answer_edit_tips.html:47
-#: templates/backup/question_edit_tips.html:43
+#: templates/answer_edit_tips.html:47 templates/question_edit_tips.html:45
 msgid "basic HTML tags are also supported"
 msgstr ""
 
-#: templates/answer_edit_tips.html:51 templates/question_edit_tips.html:48
-#: templates/backup/answer_edit_tips.html:50
-#: templates/backup/question_edit_tips.html:46
+#: templates/answer_edit_tips.html:50 templates/question_edit_tips.html:48
 msgid "learn more about Markdown"
 msgstr ""
 
-#: templates/ask.html:4 templates/ask.html.py:60 templates/backup/ask.html:3
-#: templates/backup/ask.html.py:59
+#: templates/ask.html:4 templates/ask.html.py:60
 msgid "Ask a question"
 msgstr ""
 
-#: templates/ask.html:106 templates/backup/ask.html:105
-msgid "Use"
-msgstr ""
-
-#: templates/ask.html:106 templates/backup/ask.html:105
-msgid "learn more about OpenID"
+#: templates/ask.html:67
+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."
 
-#: templates/ask.html:106 templates/authopenid/signin.html:34
-#: templates/authopenid/signin.html:60 templates/backup/ask.html:105
-msgid "Login"
-msgstr ""
-
-#: templates/ask.html:109 templates/backup/ask.html:108
-msgid "Get your own "
+#: templates/ask.html:73
+#, python-format
+msgid "must have valid %(email)s to post"
 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. "
 
-#: templates/ask.html:117 templates/authopenid/sendpw.html:27
-#: templates/backup/ask.html:116
-msgid "User name"
+#: templates/ask.html:108
+msgid "(required)"
 msgstr ""
 
-#: templates/ask.html:120 templates/backup/ask.html:119
-msgid "Email: (won't be shown to anyone)"
-msgstr ""
+#: templates/ask.html:115
+msgid "Login/signup to post your question"
+msgstr "Login/Signup to Post"
 
-#: templates/ask.html:127 templates/backup/ask.html:126
+#: templates/ask.html:117
 msgid "Ask your question"
-msgstr ""
+msgstr "Ask Your Question"
 
 #: templates/badge.html:6 templates/badge.html.py:17
-#: templates/backup/badge.html:5 templates/backup/badge.html.py:16
 msgid "Badge"
 msgstr ""
 
-#: templates/badge.html:26 templates/backup/badge.html:25
+#: templates/badge.html:26
 msgid "The users have been awarded with badges:"
 msgstr ""
 
-#: templates/badges.html:6 templates/backup/badges.html:6
+#: templates/badges.html:6
 msgid "Badges summary"
 msgstr ""
 
 #: templates/badges.html:17 templates/user_stats.html:113
-#: templates/backup/badges.html:17 templates/backup/user_stats.html:112
 msgid "Badges"
 msgstr ""
 
-#: templates/badges.html:21 templates/backup/badges.html:21
+#: templates/badges.html:21
 msgid "Community gives you awards for your questions, answers and votes."
 msgstr ""
+"If your questions and answers are highly voted, your contribution to this "
+"Q&amp;A community will be recognized with the variety of badges."
 
-#: templates/badges.html:22 templates/backup/badges.html:22
+#: templates/badges.html:22
 msgid ""
 "Below is the list of available badges and number of times each type of badge "
 "has been awarded."
 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."
 
-#: templates/badges.html:49 templates/backup/badges.html:49
+#: templates/badges.html:49
 msgid "Community badges"
-msgstr ""
+msgstr "Badge levels"
 
-#: templates/badges.html:55 templates/backup/badges.html:55
-msgid "Gold badge is very rare."
+#: templates/badges.html:55
+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:56 templates/backup/badges.html:56
-msgid ""
-"To obtain it you have to show profound knowledge and ability in addition to "
-"actively participating in the community."
+#: templates/badges.html:63
+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:57 templates/backup/badges.html:57
-msgid "Gold badge is the highest award in this community."
-msgstr ""
-
-#: templates/badges.html:65 templates/backup/badges.html:65
-msgid "Obtaining silver badge requires significant patience."
-msgstr ""
-
-#: templates/badges.html:66 templates/backup/badges.html:66
-msgid "If you got one, you've very significantly contributed to this community"
-msgstr ""
-
-#: templates/badges.html:69 templates/backup/badges.html:69
+#: templates/badges.html:66
 msgid "bronze badge: often given as a special honor"
 msgstr ""
 
-#: templates/badges.html:73 templates/backup/badges.html:73
-msgid ""
-"If you are active in this community, you will will get this medal - still it "
-"is a special honor."
+#: templates/badges.html:70
+msgid "bronze badge description"
 msgstr ""
+"If you are an active participant in this community, you will be recognized "
+"with this badge."
 
-#: templates/base.html:59 templates/base_content.html:60
-#: templates/backup/base.html:59 templates/backup/base_content.html:57
-msgid "congratulations, community gave you a badge"
-msgstr ""
-
-#: templates/base.html:61 templates/base_content.html:62
-#: templates/backup/base.html:61 templates/backup/base_content.html:59
-msgid "profile"
-msgstr ""
-
-#: templates/base_content.html:61 templates/backup/base_content.html:58
-msgid "see"
-msgstr ""
-
-#: templates/book.html:7 templates/backup/book.html:7
+#: templates/book.html:7
 msgid "reading channel"
 msgstr ""
 
-#: templates/book.html:26 templates/backup/book.html:26
+#: templates/book.html:26
 msgid "[author]"
 msgstr ""
 
-#: templates/book.html:30 templates/backup/book.html:30
+#: templates/book.html:30
 msgid "[publisher]"
 msgstr ""
 
-#: templates/book.html:34 templates/backup/book.html:34
+#: templates/book.html:34
 msgid "[publication date]"
 msgstr ""
 
-#: templates/book.html:38 templates/backup/book.html:38
+#: templates/book.html:38
 msgid "[price]"
 msgstr ""
 
-#: templates/book.html:39 templates/backup/book.html:39
+#: templates/book.html:39
 msgid "currency unit"
 msgstr ""
 
-#: templates/book.html:42 templates/backup/book.html:42
+#: templates/book.html:42
 msgid "[pages]"
 msgstr ""
 
-#: templates/book.html:43 templates/backup/book.html:43
+#: templates/book.html:43
 msgid "pages abbreviation"
 msgstr ""
 
-#: templates/book.html:46 templates/backup/book.html:46
+#: templates/book.html:46
 msgid "[tags]"
 msgstr ""
 
-#: templates/book.html:56 templates/backup/book.html:56
+#: templates/book.html:56
 msgid "author blog"
 msgstr ""
 
-#: templates/book.html:62 templates/backup/book.html:62
+#: templates/book.html:62
 msgid "book directory"
 msgstr ""
 
-#: templates/book.html:66 templates/backup/book.html:66
+#: templates/book.html:66
 msgid "buy online"
 msgstr ""
 
-#: templates/book.html:79 templates/backup/book.html:79
+#: templates/book.html:79
 msgid "reader questions"
 msgstr ""
 
-#: templates/book.html:82 templates/backup/book.html:82
+#: templates/book.html:82
 msgid "ask the author"
 msgstr ""
 
 #: templates/book.html:88 templates/book.html.py:93
-#: templates/users_questions.html:17 templates/backup/book.html:88
-#: templates/backup/book.html.py:93 templates/backup/users_questions.html:16
+#: templates/users_questions.html:17
 msgid "this question was selected as favorite"
 msgstr ""
 
 #: templates/book.html:88 templates/book.html.py:93
 #: templates/users_questions.html:11 templates/users_questions.html.py:17
-#: templates/backup/book.html:88 templates/backup/book.html.py:93
-#: templates/backup/users_questions.html:10
-#: templates/backup/users_questions.html:16
 msgid "number of times"
 msgstr ""
 
-#: templates/book.html:105 templates/index.html:47 templates/questions.html:46
+#: templates/book.html:105 templates/index.html:48 templates/questions.html:46
 #: templates/unanswered.html:37 templates/users_questions.html:30
-#: templates/backup/book.html:105 templates/backup/index.html:47
-#: templates/backup/questions.html:45 templates/backup/unanswered.html:36
-#: templates/backup/users_questions.html:29 templates/tough/unanswered.html:35
 msgid "votes"
 msgstr ""
 
-#: templates/book.html:108 templates/backup/book.html:108
+#: templates/book.html:108
 msgid "the answer has been accepted to be correct"
 msgstr ""
 
-#: templates/book.html:115 templates/index.html:48 templates/questions.html:47
+#: templates/book.html:115 templates/index.html:49 templates/questions.html:47
 #: templates/unanswered.html:38 templates/users_questions.html:40
-#: templates/backup/book.html:115 templates/backup/index.html:48
-#: templates/backup/questions.html:46 templates/backup/unanswered.html:37
-#: templates/backup/users_questions.html:39 templates/tough/unanswered.html:36
 msgid "views"
 msgstr ""
 
-#: templates/book.html:125 templates/index.html:68 templates/question.html:112
-#: templates/question.html.py:479 templates/questions.html:84
-#: templates/questions.html.py:149 templates/tags.html:47
+#: templates/book.html:125 templates/index.html:69 templates/question.html:115
+#: templates/question.html.py:486 templates/questions.html:84
+#: templates/questions.html.py:156 templates/tags.html:47
 #: templates/unanswered.html:75 templates/unanswered.html.py:109
-#: templates/users_questions.html:52 templates/backup/book.html:125
-#: templates/backup/index.html:68 templates/backup/index.html.py:93
-#: templates/backup/question.html:111 templates/backup/question.html.py:469
-#: templates/backup/questions.html:83 templates/backup/questions.html:148
-#: templates/backup/tags.html:46 templates/backup/unanswered.html:74
-#: templates/backup/unanswered.html:108
-#: templates/backup/users_questions.html:51 templates/tough/unanswered.html:72
-#: templates/tough/unanswered.html:105
+#: templates/users_questions.html:52
 msgid "using tags"
 msgstr ""
 
-#: templates/book.html:147 templates/backup/book.html:147
+#: templates/book.html:147
 msgid "subscribe to book RSS feed"
 msgstr ""
 
 #: templates/book.html:147 templates/index.html:116
-#: templates/backup/book.html:147 templates/backup/index.html:115
 msgid "subscribe to the questions feed"
 msgstr ""
 
 #: templates/close.html:6 templates/close.html.py:16
-#: templates/backup/close.html:6 templates/backup/close.html.py:16
 msgid "Close question"
 msgstr ""
 
-#: templates/close.html:19 templates/backup/close.html:19
+#: templates/close.html:19
 msgid "Close the question"
 msgstr ""
 
-#: templates/close.html:25 templates/backup/close.html:25
+#: templates/close.html:25
 msgid "Reasons"
 msgstr ""
 
-#: templates/close.html:28 templates/backup/close.html:28
+#: templates/close.html:28
 msgid "OK to close"
 msgstr ""
 
-#: templates/faq.html:11 templates/backup/faq.html:11
-#: templates/tough/faq.html:9
+#: templates/faq.html:11
 msgid "Frequently Asked Questions "
 msgstr ""
 
-#: templates/faq.html:15 templates/backup/faq.html:15
-#: templates/tough/faq.html:13
+#: templates/faq.html:16
 msgid "What kinds of questions can I ask here?"
 msgstr ""
 
-#: templates/faq.html:16 templates/backup/faq.html:16
-#: templates/tough/faq.html:14
+#: templates/faq.html:17
 msgid ""
 "Most importanly - questions should be <strong>relevant</strong> to this "
 "community."
 msgstr ""
+"Please ask questions about all aspects of <strong>Magnetic Resonance</"
+"strong> - <strong>NMR</strong>, <strong>EPR</strong>, <strong>MRI</strong>. "
+"Questions about both theory and practice in these fields are welcome, "
+"including questions about the physical foundations, scientific applications, "
+"instrumentation, interpretation of data, software, preparation and handling "
+"of samples etc. "
 
-#: templates/faq.html:17 templates/backup/faq.html:17
-#: templates/tough/faq.html:15
+#: templates/faq.html:18
 msgid ""
 "Before asking the question - please make sure to use search to see whether "
 "your question has alredy been answered."
 msgstr ""
+"Before you ask - please make sure to search for a similar question. You can "
+"search questions by their title or tags."
 
-#: templates/faq.html:20 templates/backup/faq.html:20
-#: templates/tough/faq.html:18
+#: templates/faq.html:21
 msgid "What questions should I avoid asking?"
-msgstr ""
+msgstr "What kinds of questions should be avoided?"
 
-#: templates/faq.html:21 templates/backup/faq.html:21
-#: templates/tough/faq.html:19
+#: templates/faq.html:22
 msgid ""
 "Please avoid asking questions that are not relevant to this community, too "
 "subjective and argumentative."
 msgstr ""
+"Please avoid asking questions that are not relevant to the subjects of NMR, "
+"EPR or MRI, also please avoid asking questions that are too argumentative or "
+"subjective."
 
-#: templates/faq.html:24 templates/backup/faq.html:24
-#: templates/tough/faq.html:22
+#: templates/faq.html:27
 msgid "What should I avoid in my answers?"
 msgstr ""
 
-#: templates/faq.html:25 templates/backup/faq.html:25
-#: templates/tough/faq.html:23
+#: templates/faq.html:28 templates/faq.html.py:132
+msgid "site title"
+msgstr "NMR Wiki Q&A"
+
+#: templates/faq.html:28
 msgid ""
 "is a Q&A site, not a discussion group. Therefore - please avoid having "
 "discussions in your answers, comment facility allows some space for brief "
 "discussions."
 msgstr ""
+"is a <strong>question and answer</strong> site - <strong>it is not a "
+"discussion group</strong>. Please avoid holding debates in your answers as "
+"they tend to dilute the essense of questions and answers. For the brief "
+"discussions please use commenting facility."
 
-#: templates/faq.html:28 templates/backup/faq.html:28
-#: templates/tough/faq.html:26
+#: templates/faq.html:32
 msgid "Who moderates this community?"
 msgstr ""
 
-#: templates/faq.html:29 templates/backup/faq.html:29
-#: templates/tough/faq.html:27
+#: templates/faq.html:33
 msgid "The short answer is: <strong>you</strong>."
 msgstr ""
 
-#: templates/faq.html:30 templates/backup/faq.html:30
-#: templates/tough/faq.html:28
+#: templates/faq.html:34
 msgid "This website is moderated by the users."
 msgstr ""
 
-#: templates/faq.html:31 templates/backup/faq.html:31
-#: templates/tough/faq.html:29
+#: templates/faq.html:35
 msgid ""
 "The reputation system allows users earn the authorization to perform a "
 "variety of moderation tasks."
 msgstr ""
 
-#: templates/faq.html:34 templates/backup/faq.html:34
-#: templates/tough/faq.html:32
+#: templates/faq.html:40
 msgid "How does reputation system work?"
 msgstr ""
 
-#: templates/faq.html:35 templates/backup/faq.html:35
-#: templates/tough/faq.html:33
-msgid ""
-"Anyone can ask questions and give answers, points are not necessary for that."
+#: 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 "
+"rough measure of the community trust to him/her. Various moderation tasks "
+"are gradually assigned to the users based on those points."
 
-#: templates/faq.html:36 templates/backup/faq.html:36
-#: templates/tough/faq.html:34
-msgid ""
-"As we've said before, users help running this site. Point system helps "
-"select users who can administer this community."
-msgstr ""
-
-#: templates/faq.html:37 templates/backup/faq.html:37
-#: templates/tough/faq.html:35
-msgid ""
-"Reputation points roughly measure how community trusts you. These points are "
-"given to you directly by other members of the community."
-msgstr ""
-
-#: templates/faq.html:40 templates/backup/faq.html:40
-#: templates/tough/faq.html:38
-msgid ""
-"For example, if you ask an interesting question or give a helpful answer, "
-"your input will be upvoted and you will gain more trust in the community."
-msgstr ""
-
-#: templates/faq.html:41 templates/backup/faq.html:41
-#: templates/tough/faq.html:39
-msgid ""
-"If on the other hand someone gives a misleading answer, the answer will be "
-"voted down and he/she loses some points."
-msgstr ""
-
-#: templates/faq.html:42 templates/backup/faq.html:42
-#: templates/tough/faq.html:40
-msgid ""
-"Each vote in favor will generate <strong>10</strong> points, each vote "
-"against will subtract <strong>2</strong> points."
-msgstr ""
-
-#: templates/faq.html:43 templates/backup/faq.html:43
-#: templates/tough/faq.html:41
-msgid ""
-"Through the votes of other people you can accumulate a maximum of "
-"<strong>200</strong> points."
-msgstr ""
-
-#: templates/faq.html:44 templates/backup/faq.html:44
-msgid "After accumulating certain number of points, you can do more:"
-msgstr ""
-
-#: templates/faq.html:52 templates/user_votes.html:14
-#: templates/backup/faq.html:52 templates/backup/user_votes.html:13
-#: templates/tough/faq.html:50
+#: templates/faq.html:59 templates/user_votes.html:14
 msgid "upvote"
 msgstr ""
 
-#: templates/faq.html:56 templates/backup/faq.html:56
-#: templates/tough/faq.html:54
+#: templates/faq.html:63
 msgid "use tags"
 msgstr ""
 
-#: templates/faq.html:60 templates/backup/faq.html:60
-#: templates/tough/faq.html:58
+#: templates/faq.html:68
 msgid "add comments"
 msgstr ""
 
-#: templates/faq.html:64 templates/user_votes.html:16
-#: templates/backup/faq.html:64 templates/backup/user_votes.html:15
-#: templates/tough/faq.html:62
+#: templates/faq.html:72 templates/user_votes.html:16
 msgid "downvote"
 msgstr ""
 
-#: templates/faq.html:71 templates/backup/faq.html:71
-#: templates/tough/faq.html:69
+#: templates/faq.html:75
+msgid "open and close own questions"
+msgstr ""
+
+#: templates/faq.html:79
 msgid "retag questions"
 msgstr ""
 
-#: templates/faq.html:75 templates/backup/faq.html:75
-#: templates/tough/faq.html:73
+#: templates/faq.html:83
 msgid "edit community wiki questions"
 msgstr ""
 
-#: templates/faq.html:79 templates/backup/faq.html:79
-#: templates/tough/faq.html:77
+#: templates/faq.html:87
 msgid "edit any answer"
 msgstr ""
 
-#: templates/faq.html:83 templates/backup/faq.html:83
-#: templates/tough/faq.html:81
+#: templates/faq.html:91
 msgid "open any closed question"
 msgstr ""
 
-#: templates/faq.html:87 templates/backup/faq.html:87
-#: templates/tough/faq.html:85
+#: templates/faq.html:95
 msgid "delete any comment"
 msgstr ""
 
-#: templates/faq.html:91 templates/backup/faq.html:91
-#: templates/tough/faq.html:89
+#: templates/faq.html:99
 msgid "delete any questions and answers and perform other moderation tasks"
 msgstr ""
 
-#: templates/faq.html:98 templates/backup/faq.html:98
+#: templates/faq.html:106
+msgid "how to validate email title"
+msgstr "How to validate email and why?"
+
+#: templates/faq.html:108
+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:112
+msgid "what is gravatar"
+msgstr "What is gravatar?"
+
+#: templates/faq.html:113
+msgid "gravatar faq info"
+msgstr ""
+"<strong>Gravatar</strong> means <strong>g</strong>lobally <strong>r</"
+"strong>ecognized <strong>avatar</strong> - your unique avatar image "
+"associated with your email address. It's simply a picture that shows next to "
+"your posts on the websites that support gravatar protocol. By default gravar "
+"appears as a square filled with a snowflake-like figure. You can <strong>set "
+"your image</strong> at <a href='http://gravatar.com'><strong>gravatar.com</"
+"strong></a>"
+
+#: templates/faq.html:116
 msgid "To register, do I need to create new password?"
 msgstr ""
 
-#: templates/faq.html:99 templates/backup/faq.html:99
-#: templates/tough/faq.html:97
+#: templates/faq.html:117
 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:100 templates/backup/faq.html:100
-#: templates/tough/faq.html:98
+#: templates/faq.html:118
 msgid "Login now!"
 msgstr ""
 
-#: templates/faq.html:103 templates/backup/faq.html:103
-#: templates/tough/faq.html:101
+#: templates/faq.html:123
 msgid "Why other people can edit my questions/answers?"
 msgstr ""
 
-#: templates/faq.html:104 templates/backup/faq.html:104
-#: templates/tough/faq.html:102
+#: templates/faq.html:124
 msgid "Goal of this site is..."
 msgstr ""
+"<span class='orange'>NMR Wiki Q&A</span> aims for offering a place for "
+"efficient exchange of ideas among users of <strong>Magnetic Resonance</"
+"strong>and specialists working in this field."
 
-#: templates/faq.html:104 templates/backup/faq.html:104
-#: templates/tough/faq.html:102
+#: templates/faq.html:124
 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:105 templates/backup/faq.html:105
-#: templates/tough/faq.html:103
+#: templates/faq.html:125
 msgid "If this approach is not for you, we respect your choice."
 msgstr ""
 
-#: templates/faq.html:107 templates/backup/faq.html:107
-#: templates/tough/faq.html:105
+#: templates/faq.html:129
 msgid "Still have questions?"
 msgstr ""
 
-#: templates/faq.html:108 templates/backup/faq.html:108
+#: templates/faq.html:130
 msgid "Please ask your question, help make our community better!"
 msgstr ""
+"Please <a href=\"/questions/ask\">ask</a> your question, help make our "
+"community better!"
 
-#: templates/faq.html:108 templates/header.html:29 templates/header.html.py:60
-#: templates/backup/faq.html:108 templates/backup/header.html:29
-#: templates/backup/header.html.py:58 templates/tough/faq.html:106
+#: templates/faq.html:132 templates/header.html:29 templates/header.html.py:60
 msgid "questions"
 msgstr ""
 
-#: templates/faq.html:108 templates/index.html:121
-#: templates/backup/faq.html:108 templates/backup/index.html:120
-#: templates/tough/faq.html:106
+#: templates/faq.html:132 templates/index.html:121
 msgid "."
 msgstr ""
 
-#: templates/footer.html:7 templates/header.html:12 templates/index.html:83
-#: templates/backup/footer.html:7 templates/backup/header.html:12
-#: templates/backup/index.html:83
+#: templates/footer.html:7 templates/header.html:14 templates/index.html:83
 msgid "about"
 msgstr ""
 
-#: templates/footer.html:8 templates/header.html:13 templates/index.html:84
-#: templates/backup/footer.html:8 templates/backup/header.html:13
-#: templates/backup/index.html:84
+#: templates/footer.html:8 templates/header.html:15 templates/index.html:84
 msgid "faq"
 msgstr ""
 
-#: templates/footer.html:9 templates/backup/footer.html:9
+#: templates/footer.html:9
 msgid "blog"
 msgstr ""
 
-#: templates/footer.html:10 templates/backup/footer.html:10
+#: templates/footer.html:10
 msgid "contact us"
 msgstr ""
 
-#: templates/footer.html:11 templates/backup/footer.html:11
+#: templates/footer.html:11
 msgid "privacy policy"
 msgstr ""
 
-#: templates/footer.html:12 templates/backup/footer.html:12
+#: templates/footer.html:12
 msgid "give feedback"
 msgstr ""
 
-#: templates/footer.html:18 templates/backup/footer.html:18
+#: templates/footer.html:18
 msgid "current revision"
 msgstr ""
 
-#: templates/header.html:8 templates/backup/header.html:8
+#: templates/header.html:10
 msgid "logout"
 msgstr ""
 
-#: templates/header.html:10 templates/authopenid/signup.html:39
-#: templates/backup/header.html:10
+#: templates/header.html:12 templates/authopenid/signup.html:41
 msgid "login"
 msgstr ""
 
-#: templates/header.html:23 templates/backup/header.html:23
+#: templates/header.html:23
 msgid "back to home page"
 msgstr ""
 
 #: templates/header.html:31 templates/header.html.py:62
-#: templates/backup/header.html:31 templates/backup/header.html.py:60
 msgid "users"
 msgstr ""
 
-#: templates/header.html:32 templates/backup/header.html:32
+#: templates/header.html:32
 msgid "books"
 msgstr ""
 
-#: templates/header.html:34 templates/index.html:121
-#: templates/backup/header.html:34 templates/backup/index.html:120
+#: templates/header.html:34
 msgid "unanswered questions"
 msgstr "unanswered"
 
-#: templates/header.html:38 templates/backup/header.html:37
+#: templates/header.html:38
 msgid "my profile"
 msgstr ""
 
-#: templates/header.html:42 templates/backup/header.html:40
+#: templates/header.html:42
 msgid "ask a question"
 msgstr ""
 
-#: templates/header.html:57 templates/backup/header.html:55
+#: templates/header.html:57
 msgid "search"
 msgstr ""
 
-#: templates/index.html:6 templates/backup/index.html:6
+#: templates/index.html:7
 msgid "Home"
 msgstr ""
 
-#: templates/index.html:7 templates/backup/index.html:7
-msgid "meta site keywords, comma separated"
-msgstr ""
-
-#: templates/index.html:21 templates/questions.html:7
-#: templates/backup/index.html:21 templates/backup/questions.html:6
+#: templates/index.html:22 templates/questions.html:7
 msgid "Questions"
 msgstr ""
 
-#: templates/index.html:23 templates/backup/index.html:23
+#: templates/index.html:24
 msgid "last updated questions"
 msgstr ""
 
-#: templates/index.html:23 templates/questions.html:25
-#: templates/unanswered.html:20 templates/backup/index.html:23
-#: templates/backup/questions.html:24 templates/backup/unanswered.html:19
-#: templates/tough/unanswered.html:18
+#: templates/index.html:24 templates/questions.html:25
+#: templates/unanswered.html:20
 msgid "newest"
 msgstr ""
 
-#: templates/index.html:24 templates/questions.html:27
-#: templates/backup/index.html:24 templates/backup/questions.html:26
+#: templates/index.html:25 templates/questions.html:27
 msgid "hottest questions"
 msgstr ""
 
-#: templates/index.html:24 templates/questions.html:27
-#: templates/backup/index.html:24 templates/backup/questions.html:26
+#: templates/index.html:25 templates/questions.html:27
 msgid "hottest"
 msgstr ""
 
-#: templates/index.html:25 templates/questions.html:28
-#: templates/backup/index.html:25 templates/backup/questions.html:27
+#: templates/index.html:26 templates/questions.html:28
 msgid "most voted questions"
 msgstr ""
 
-#: templates/index.html:25 templates/questions.html:28
-#: templates/backup/index.html:25 templates/backup/questions.html:27
+#: templates/index.html:26 templates/questions.html:28
 msgid "most voted"
 msgstr ""
 
-#: templates/index.html:26 templates/backup/index.html:26
+#: templates/index.html:27
 msgid "all questions"
 msgstr ""
 
-#: templates/index.html:46 templates/questions.html:45
+#: templates/index.html:47 templates/questions.html:45
 #: templates/unanswered.html:36 templates/users_questions.html:35
-#: templates/backup/index.html:46 templates/backup/questions.html:44
-#: templates/backup/unanswered.html:35
-#: templates/backup/users_questions.html:34 templates/tough/unanswered.html:34
 msgid "answers"
 msgstr ""
 
-#: templates/index.html:68 templates/question.html:112
-#: templates/question.html.py:479 templates/questions.html:84
-#: templates/questions.html.py:149 templates/tags.html:47
+#: templates/index.html:69 templates/question.html:115
+#: templates/question.html.py:486 templates/questions.html:84
+#: templates/questions.html.py:156 templates/tags.html:47
 #: templates/unanswered.html:75 templates/unanswered.html.py:109
-#: templates/users_questions.html:52 templates/backup/index.html:68
-#: templates/backup/index.html.py:93 templates/backup/question.html:111
-#: templates/backup/question.html.py:469 templates/backup/questions.html:83
-#: templates/backup/questions.html:148 templates/backup/tags.html:46
-#: templates/backup/unanswered.html:74 templates/backup/unanswered.html:108
-#: templates/backup/users_questions.html:51 templates/tough/unanswered.html:72
-#: templates/tough/unanswered.html:105
+#: templates/users_questions.html:52
 msgid "see questions tagged"
 msgstr ""
 
-#: templates/index.html:79 templates/backup/index.html:79
+#: templates/index.html:80
 msgid "welcome to website"
-msgstr ""
-
-#: templates/index.html:81 templates/backup/index.html:81
-msgid "what is this website"
-msgstr ""
+msgstr "Welcome to NMR Wiki Q&A"
 
-#: templates/index.html:82 templates/backup/index.html:82
-msgid "what can one do on this website"
-msgstr ""
-
-#: templates/index.html:89 templates/backup/index.html:89
+#: templates/index.html:89
 msgid "Recent tags"
 msgstr ""
 
@@ -1468,325 +1351,315 @@ msgid "see questions tagged '%(tagname)s'"
 msgstr ""
 
 #: templates/index.html:97 templates/index.html.py:121
-#: templates/backup/index.html:96 templates/backup/index.html.py:120
 msgid "popular tags"
-msgstr ""
+msgstr "tags"
 
-#: templates/index.html:101 templates/backup/index.html:100
+#: templates/index.html:101
 msgid "Recent awards"
-msgstr ""
+msgstr "Recent badges"
 
-#: templates/index.html:107 templates/backup/index.html:106
+#: templates/index.html:107
 msgid "given to"
 msgstr ""
 
-#: templates/index.html:112 templates/backup/index.html:111
+#: templates/index.html:112
 msgid "all awards"
-msgstr ""
+msgstr "all badges"
 
-#: templates/index.html:116 templates/backup/index.html:115
+#: templates/index.html:116
 msgid "subscribe to last 30 questions by RSS"
 msgstr ""
 
-#: templates/index.html:121 templates/backup/index.html:120
+#: templates/index.html:121
 msgid "Still looking for more? See"
 msgstr ""
 
-#: templates/index.html:121 templates/backup/index.html:120
-msgid "complete list of quesionts"
-msgstr ""
+#: templates/index.html:121
+msgid "complete list of questions"
+msgstr "list of all questions"
 
-#: templates/index.html:121 templates/backup/index.html:120
+#: templates/index.html:121
 msgid "or"
 msgstr ""
 
-#: templates/index.html:121 templates/backup/index.html:120
+#: templates/index.html:121
 msgid "Please help us answer"
 msgstr ""
 
+#: templates/index.html:121
+msgid "list of unanswered questions"
+msgstr "unanswered questions"
+
 #: templates/logout.html:6 templates/logout.html.py:17
-#: templates/backup/logout.html:6 templates/backup/logout.html.py:17
 msgid "Logout"
 msgstr ""
 
-#: templates/logout.html:20 templates/backup/logout.html:20
+#: templates/logout.html:20
 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 NMR Wiki Q&A.</"
+"p><p>If you wish to sign off completely - please make sure to log out from "
+"your OpenID provider."
 
-#: templates/logout.html:21 templates/backup/logout.html:21
+#: templates/logout.html:21
 msgid "Logout now"
-msgstr ""
+msgstr "Logout Now"
 
-#: templates/pagesize.html:6 templates/backup/pagesize.html:6
+#: templates/pagesize.html:6
 msgid "posts per page"
 msgstr ""
 
 #: templates/paginator.html:6 templates/paginator.html.py:7
-#: templates/backup/paginator.html:5 templates/backup/paginator.html.py:6
 msgid "previous"
 msgstr ""
 
-#: templates/paginator.html:20 templates/backup/paginator.html:19
+#: templates/paginator.html:19
 msgid "current page"
 msgstr ""
 
-#: templates/paginator.html:23 templates/paginator.html.py:30
-#: templates/backup/paginator.html:22 templates/backup/paginator.html.py:29
+#: templates/paginator.html:22 templates/paginator.html.py:29
 msgid "page number "
 msgstr ""
 
-#: templates/paginator.html:23 templates/paginator.html.py:30
-#: templates/backup/paginator.html:22 templates/backup/paginator.html.py:29
+#: templates/paginator.html:22 templates/paginator.html.py:29
 msgid "number - make blank in english"
 msgstr ""
 
-#: templates/paginator.html:34 templates/backup/paginator.html:33
+#: templates/paginator.html:33
 msgid "next page"
 msgstr ""
 
 #: templates/privacy.html:6 templates/privacy.html.py:11
-#: templates/backup/privacy.html:5 templates/backup/privacy.html.py:10
 msgid "Privacy policy"
 msgstr ""
 
-#: templates/privacy.html:15 templates/backup/privacy.html:14
+#: templates/privacy.html:15
 msgid "general message about privacy"
 msgstr ""
 
-#: templates/privacy.html:18 templates/backup/privacy.html:17
+#: templates/privacy.html:18
 msgid "Site Visitors"
 msgstr ""
 
-#: templates/privacy.html:20 templates/backup/privacy.html:19
+#: templates/privacy.html:20
 msgid "what technical information is collected about visitors"
 msgstr ""
 
-#: templates/privacy.html:23 templates/backup/privacy.html:22
+#: templates/privacy.html:23
 msgid "Personal Information"
 msgstr ""
 
-#: templates/privacy.html:25 templates/backup/privacy.html:24
+#: templates/privacy.html:25
 msgid "details on personal information policies"
 msgstr ""
 
-#: templates/privacy.html:28 templates/backup/privacy.html:27
+#: templates/privacy.html:28
 msgid "Other Services"
 msgstr ""
 
-#: templates/privacy.html:30 templates/backup/privacy.html:29
+#: templates/privacy.html:30
 msgid "details on sharing data with third parties"
 msgstr ""
 
-#: templates/privacy.html:35 templates/backup/privacy.html:34
+#: templates/privacy.html:35
 msgid "cookie policy details"
 msgstr ""
 
-#: templates/privacy.html:37 templates/backup/privacy.html:36
+#: templates/privacy.html:37
 msgid "Policy Changes"
 msgstr ""
 
-#: templates/privacy.html:38 templates/backup/privacy.html:37
+#: templates/privacy.html:38
 msgid "how privacy policies can be changed"
 msgstr ""
 
-#: templates/question.html:66 templates/question.html.py:78
-#: templates/backup/question.html:65 templates/backup/question.html.py:77
+#: templates/question.html:69 templates/question.html.py:81
 msgid "i like this post (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:68 templates/question.html.py:80
-#: templates/question.html:273 templates/backup/question.html:67
-#: templates/backup/question.html.py:79 templates/backup/question.html:272
+#: templates/question.html:71 templates/question.html.py:83
+#: templates/question.html:276
 msgid "current number of votes"
 msgstr ""
 
-#: templates/question.html:73 templates/question.html.py:84
-#: templates/backup/question.html:72 templates/backup/question.html.py:83
+#: templates/question.html:76 templates/question.html.py:87
 msgid "i dont like this post (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:90 templates/backup/question.html:89
+#: templates/question.html:93
 msgid "mark this question as favorite (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:96 templates/backup/question.html:95
+#: templates/question.html:99
 msgid "remove favorite mark from this question (click again to restore mark)"
 msgstr ""
 
-#: templates/question.html:121 templates/question.html.py:304
+#: templates/question.html:124 templates/question.html.py:307
 #: templates/revisions_answer.html:53 templates/revisions_question.html:53
-#: templates/backup/question.html:120 templates/backup/question.html.py:303
-#: templates/backup/revisions_answer.html:52
-#: templates/backup/revisions_question.html:51
 msgid "edit"
 msgstr ""
 
-#: templates/question.html:125 templates/question.html.py:314
-#: templates/backup/question.html:124 templates/backup/question.html.py:307
+#: templates/question.html:128 templates/question.html.py:317
 msgid "delete"
 msgstr ""
 
-#: templates/question.html:130 templates/backup/question.html:129
+#: templates/question.html:133
 msgid "reopen"
 msgstr ""
 
-#: templates/question.html:135 templates/backup/question.html:134
+#: templates/question.html:138
 msgid "close"
 msgstr ""
 
-#: templates/question.html:141 templates/question.html.py:327
-#: templates/backup/question.html:140 templates/backup/question.html.py:317
+#: templates/question.html:144 templates/question.html.py:330
 msgid ""
 "report as offensive (i.e containing spam, advertising, malicious text, etc.)"
 msgstr ""
 
-#: templates/question.html:142 templates/question.html.py:328
-#: templates/backup/question.html:141 templates/backup/question.html.py:318
+#: templates/question.html:145 templates/question.html.py:331
 msgid "flag offensive"
 msgstr ""
 
-#: templates/question.html:154 templates/question.html.py:337
+#: templates/question.html:157 templates/question.html.py:340
 #: templates/revisions_answer.html:65 templates/revisions_question.html:65
-#: templates/backup/question.html:153 templates/backup/question.html.py:327
-#: templates/backup/revisions_answer.html:64
-#: templates/backup/revisions_question.html:63
 msgid "updated"
 msgstr ""
 
-#: templates/question.html:203 templates/question.html.py:384
+#: templates/question.html:206 templates/question.html.py:387
 #: templates/revisions_answer.html:63 templates/revisions_question.html:63
-#: templates/backup/question.html:202 templates/backup/question.html.py:374
-#: templates/backup/revisions_answer.html:62
-#: templates/backup/revisions_question.html:61
 msgid "asked"
 msgstr ""
 
-#: templates/question.html:233 templates/question.html.py:411
-#: templates/backup/question.html:232 templates/backup/question.html.py:401
+#: templates/question.html:236 templates/question.html.py:414
 msgid "comments"
 msgstr ""
 
-#: templates/question.html:234 templates/question.html.py:412
-#: templates/backup/question.html:233 templates/backup/question.html.py:402
+#: templates/question.html:237 templates/question.html.py:415
 msgid "add comment"
 msgstr ""
 
-#: templates/question.html:247 templates/backup/question.html:246
+#: templates/question.html:250
 #, python-format
 msgid ""
 "The question has been closed for the following reason \"%(question."
 "get_close_reason_display)s\" by"
 msgstr ""
 
-#: templates/question.html:249 templates/backup/question.html:248
+#: templates/question.html:252
 #, python-format
 msgid "close date %(question.closed_at)s"
 msgstr ""
 
-#: templates/question.html:256 templates/user_stats.html:28
-#: templates/backup/question.html:255 templates/backup/user_stats.html:27
+#: templates/question.html:259 templates/user_stats.html:28
 msgid "Answers"
 msgstr " Answers"
 
-#: templates/question.html:258 templates/backup/question.html:257
+#: templates/question.html:261
 msgid "oldest answers will be shown first"
 msgstr ""
 
-#: templates/question.html:258 templates/backup/question.html:257
+#: templates/question.html:261
 msgid "oldest answers"
 msgstr "oldest"
 
-#: templates/question.html:259 templates/backup/question.html:258
+#: templates/question.html:262
 msgid "newest answers will be shown first"
 msgstr ""
 
-#: templates/question.html:259 templates/backup/question.html:258
+#: templates/question.html:262
 msgid "newest answers"
 msgstr "newest"
 
-#: templates/question.html:260 templates/backup/question.html:259
+#: templates/question.html:263
 msgid "most voted answers will be shown first"
 msgstr ""
 
-#: templates/question.html:260 templates/backup/question.html:259
+#: templates/question.html:263
 msgid "popular answers"
 msgstr "most voted"
 
-#: templates/question.html:272 templates/backup/question.html:271
+#: templates/question.html:275
 msgid "i like this answer (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:278 templates/backup/question.html:277
+#: templates/question.html:281
 msgid "i dont like this answer (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:284 templates/backup/question.html:283
+#: templates/question.html:287
 msgid "mark this answer as favorite (click again to undo)"
 msgstr ""
 
-#: templates/question.html:289 templates/backup/question.html:288
+#: templates/question.html:292
 msgid "the author of the question has selected this answer as correct"
 msgstr ""
 
-#: templates/question.html:311
+#: templates/question.html:314
 msgid "undelete"
 msgstr ""
 
-#: templates/question.html:321 templates/backup/question.html:311
+#: templates/question.html:324
 msgid "answer permanent link"
 msgstr ""
 
-#: templates/question.html:322 templates/backup/question.html:312
+#: templates/question.html:325
 msgid "permanent link"
 msgstr ""
 
-#: templates/question.html:436 templates/backup/question.html:426
+#: templates/question.html:438
 msgid "Your answer"
 msgstr ""
 
-#: templates/question.html:460 templates/backup/question.html:450
+#: templates/question.html:441
+msgid "you can answer anonymously and then login"
+msgstr ""
+"<span class='strong big'>You are now not logged in</span> but you can answer "
+"first and then login"
+
+#: templates/question.html:465
 msgid "Answer the question"
 msgstr ""
 
-#: templates/question.html:462 templates/backup/question.html:452
-msgid "Login to answer"
+#: templates/question.html:467
+msgid "Notify me daily if there are any new answers."
 msgstr ""
 
-#: templates/question.html:474 templates/backup/question.html:464
+#: templates/question.html:469
+msgid "once you sign in you will be able to subscribe for any updates here"
+msgstr "Here logged in users can sign up for the question updates."
+
+#: templates/question.html:481
 msgid "Question tags"
 msgstr "Tags"
 
-#: templates/question.html:484 templates/backup/question.html:474
+#: templates/question.html:491
 msgid "question asked"
 msgstr "Asked"
 
-#: templates/question.html:484 templates/question.html.py:490
-#: templates/user_info.html:51 templates/backup/question.html:474
-#: templates/backup/question.html.py:480 templates/backup/user_info.html:50
+#: templates/question.html:491 templates/question.html.py:497
+#: templates/user_info.html:51
 msgid "ago"
 msgstr ""
 
-#: templates/question.html:487 templates/backup/question.html:477
+#: templates/question.html:494
 msgid "question was seen"
 msgstr "Seen"
 
-#: templates/question.html:487 templates/backup/question.html:477
+#: templates/question.html:494
 msgid "times"
 msgstr ""
 
-#: templates/question.html:490 templates/backup/question.html:480
+#: templates/question.html:497
 msgid "last updated"
 msgstr "Last updated"
 
-#: templates/question.html:495 templates/backup/question.html:485
+#: templates/question.html:502
 msgid "Related questions"
 msgstr ""
 
 #: templates/question_edit.html:4 templates/question_edit.html.py:65
-#: templates/backup/question_edit.html:2
-#: templates/backup/question_edit.html:63
 msgid "Edit question"
 msgstr ""
 
@@ -1795,38 +1668,54 @@ msgid "question tips"
 msgstr "Tips"
 
 #: templates/question_edit_tips.html:7
-#: templates/backup/question_edit_tips.html:5
 msgid "please ask a relevant question"
 msgstr ""
 
 #: templates/question_edit_tips.html:10
-#: templates/backup/question_edit_tips.html:8
 msgid "please try provide enough details"
 msgstr "provide enough details"
 
-#: templates/questions.html:23 templates/backup/questions.html:22
+#: templates/question_retag.html:3 templates/question_retag.html.py:52
+msgid "Change tags"
+msgstr ""
+
+#: templates/question_retag.html:39
+msgid "up to 5 tags, less than 20 characters each"
+msgstr ""
+
+#: templates/question_retag.html:86
+msgid "Why use and modify tags?"
+msgstr ""
+
+#: templates/question_retag.html:89
+msgid "tags help us keep Questions organized"
+msgstr ""
+
+#: templates/question_retag.html:95
+msgid "tag editors receive special awards from the community"
+msgstr ""
+
+#: templates/questions.html:23
 msgid "Found by tags"
 msgstr "Tagged questions"
 
-#: templates/questions.html:23 templates/backup/questions.html:22
+#: templates/questions.html:23
 msgid "Found by title"
 msgstr ""
 
-#: templates/questions.html:23 templates/backup/questions.html:22
+#: templates/questions.html:23
 msgid "All questions"
 msgstr ""
 
 #: templates/questions.html:25 templates/unanswered.html:20
-#: templates/backup/questions.html:24 templates/backup/unanswered.html:19
-#: templates/tough/unanswered.html:18
 msgid "most recently asked questions"
 msgstr ""
 
-#: templates/questions.html:26 templates/backup/questions.html:25
+#: templates/questions.html:26
 msgid "most recently updated questions"
 msgstr ""
 
-#: templates/questions.html:26 templates/backup/questions.html:25
+#: templates/questions.html:26
 msgid "active"
 msgstr ""
 
@@ -1846,19 +1735,19 @@ msgstr[0] ""
 "class=\"tag\">%(tagname)s</span></p>"
 msgstr[1] ""
 "\n"
-"<div class=\"questions-count\">%(q_num)s</div><p>questions tagged</"
-"p><p><span class=\"tag\">%(tagname)s</span></p>"
+"<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
 #, python-format
 msgid ""
 "\n"
-"\t\t\thave total %(q_num)s questions containing %(searchtitle)s\n"
-"\t\t\t"
+"\t\t\t\thave total %(q_num)s questions containing %(searchtitle)s\n"
+"\t\t\t\t"
 msgid_plural ""
 "\n"
-"\t\t\thave total %(q_num)s questions containing %(searchtitle)s\n"
-"\t\t\t"
+"\t\t\t\thave total %(q_num)s questions containing %(searchtitle)s\n"
+"\t\t\t\t"
 msgstr[0] ""
 "\n"
 "<div class=\"questions-count\">%(q_num)s</div><p>question with title "
@@ -1870,114 +1759,121 @@ msgstr[1] ""
 "containing <strong><span class=\"darkred\">%(searchtitle)s</span></strong></"
 "p>"
 
-#: templates/questions.html:124
+#: templates/questions.html:122
+#, python-format
+msgid ""
+"\n"
+"\t\t\t\thave total %(q_num)s questions\n"
+"\t\t\t\t"
+msgid_plural ""
+"\n"
+"\t\t\t\thave total %(q_num)s questions\n"
+"\t\t\t\t"
+msgstr[0] ""
+"\n"
+"<div class=\"questions-count\">%(q_num)s</div><p>question</p>"
+msgstr[1] ""
+"\n"
+"<div class=\"questions-count\">%(q_num)s</div><p>questions</p>"
+
+#: templates/questions.html:131
 msgid "latest questions info"
 msgstr "<strong>Newest</strong> questions are shown first."
 
-#: templates/questions.html:128 templates/backup/questions.html:127
+#: templates/questions.html:135
 msgid "Questions are sorted by the <strong>time of last update</strong>."
 msgstr ""
 
-#: templates/questions.html:129 templates/backup/questions.html:128
+#: templates/questions.html:136
 msgid "Most recently answered ones are shown first."
-msgstr ""
+msgstr "<strong>Most recently answered</strong> questions are shown first."
 
-#: templates/questions.html:133 templates/backup/questions.html:132
+#: templates/questions.html:140
 msgid "Questions sorted by <strong>number of responses</strong>."
-msgstr ""
+msgstr "Questions sorted by the <strong>number of answers</strong>."
 
-#: templates/questions.html:134 templates/backup/questions.html:133
+#: templates/questions.html:141
 msgid "Most answered questions are shown first."
-msgstr ""
+msgstr " "
 
-#: templates/questions.html:138 templates/backup/questions.html:137
+#: templates/questions.html:145
 msgid "Questions are sorted by the <strong>number of votes</strong>."
 msgstr ""
 
-#: templates/questions.html:139 templates/backup/questions.html:138
+#: templates/questions.html:146
 msgid "Most voted questions are shown first."
 msgstr ""
 
-#: templates/questions.html:146 templates/unanswered.html:105
-#: templates/backup/questions.html:145 templates/backup/unanswered.html:104
-#: templates/tough/unanswered.html:101
+#: templates/questions.html:153 templates/unanswered.html:105
 msgid "Related tags"
 msgstr "Tags"
 
 #: templates/reopen.html:6 templates/reopen.html.py:16
-#: templates/backup/reopen.html:4 templates/backup/reopen.html.py:14
 msgid "Reopen question"
 msgstr ""
 
-#: templates/reopen.html:19 templates/backup/reopen.html:17
+#: templates/reopen.html:19
 msgid "Open the previously closed question"
 msgstr ""
 
-#: templates/reopen.html:22 templates/backup/reopen.html:20
+#: templates/reopen.html:22
 msgid "The question was closed for the following reason "
 msgstr ""
 
-#: templates/reopen.html:22 templates/backup/reopen.html:20
+#: templates/reopen.html:22
 msgid "reason - leave blank in english"
 msgstr ""
 
-#: templates/reopen.html:22 templates/backup/reopen.html:20
+#: templates/reopen.html:22
 msgid "on "
 msgstr ""
 
-#: templates/reopen.html:22 templates/backup/reopen.html:20
+#: templates/reopen.html:22
 msgid "date closed"
 msgstr ""
 
-#: templates/reopen.html:29 templates/backup/reopen.html:27
+#: templates/reopen.html:29
 msgid "Reopen this question"
 msgstr ""
 
 #: templates/revisions_answer.html:7 templates/revisions_answer.html.py:36
 #: templates/revisions_question.html:8 templates/revisions_question.html:36
-#: templates/backup/revisions_answer.html:6
-#: templates/backup/revisions_answer.html:35
-#: templates/backup/revisions_question.html:6
-#: templates/backup/revisions_question.html:34
 msgid "Revision history"
 msgstr ""
 
 #: templates/tags.html:6 templates/tags.html.py:29
-#: templates/backup/tags.html:5 templates/backup/tags.html.py:28
 msgid "Tag list"
 msgstr ""
 
-#: templates/tags.html:31 templates/backup/tags.html:30
+#: templates/tags.html:31
 msgid "sorted alphabetically"
 msgstr ""
 
-#: templates/tags.html:31 templates/backup/tags.html:30
+#: templates/tags.html:31
 msgid "by name"
 msgstr ""
 
-#: templates/tags.html:32 templates/backup/tags.html:31
+#: templates/tags.html:32
 msgid "sorted by frequency of tag use"
 msgstr ""
 
-#: templates/tags.html:32 templates/backup/tags.html:31
+#: templates/tags.html:32
 msgid "by popularity"
 msgstr ""
 
-#: templates/tags.html:38 templates/backup/tags.html:37
+#: templates/tags.html:38
 msgid "All tags matching query"
 msgstr ""
 
-#: templates/tags.html:38 templates/backup/tags.html:37
+#: templates/tags.html:38
 msgid "all tags - make this empty in english"
 msgstr ""
 
-#: templates/tags.html:41 templates/backup/tags.html:40
+#: templates/tags.html:41
 msgid "Nothing found"
 msgstr ""
 
 #: templates/unanswered.html:7 templates/unanswered.html.py:18
-#: templates/backup/unanswered.html:6 templates/backup/unanswered.html:17
-#: templates/tough/unanswered.html:5 templates/tough/unanswered.html.py:16
 msgid "Unanswered questions"
 msgstr ""
 
@@ -1988,41 +1884,39 @@ msgstr ""
 "<div class=\"questions-count\">%(num_q)s</div><strong>unanswered</strong> "
 "questions"
 
-#: templates/unanswered.html:99 templates/backup/questions.html:107
-#: templates/backup/unanswered.html:97
+#: templates/unanswered.html:99
 msgid "Have a total of"
 msgstr ""
 
-#: templates/user_edit.html:6 templates/backup/user_edit.html:4
+#: templates/user_edit.html:6
 msgid "Edit user profile"
 msgstr ""
 
-#: templates/user_edit.html:19 templates/backup/user_edit.html:17
+#: templates/user_edit.html:19
 msgid "edit profile"
 msgstr ""
 
-#: templates/user_edit.html:31 templates/backup/user_edit.html:29
+#: templates/user_edit.html:31
 msgid "image associated with your email address"
 msgstr ""
 
-#: templates/user_edit.html:31 templates/backup/user_edit.html:29
+#: templates/user_edit.html:31
 msgid "avatar"
-msgstr ""
+msgstr "<a href='/faq#gravatar'>gravatar</a>"
 
 #: templates/user_edit.html:36 templates/user_info.html:31
-#: templates/backup/user_edit.html:34 templates/backup/user_info.html:30
 msgid "Registered user"
 msgstr ""
 
-#: templates/user_edit.html:82 templates/backup/user_edit.html:80
+#: templates/user_edit.html:82
 msgid "Update"
 msgstr ""
 
-#: templates/user_info.html:34 templates/backup/user_info.html:33
+#: templates/user_info.html:34
 msgid "update profile"
 msgstr ""
 
-#: templates/user_info.html:40 templates/backup/user_info.html:39
+#: templates/user_info.html:40
 msgid "real name"
 msgstr ""
 
@@ -2030,35 +1924,59 @@ msgstr ""
 msgid "member for"
 msgstr ""
 
-#: templates/user_info.html:50 templates/backup/user_info.html:49
+#: templates/user_info.html:50
 msgid "last seen"
 msgstr ""
 
-#: templates/user_info.html:56 templates/backup/user_info.html:55
+#: templates/user_info.html:56
 msgid "user website"
 msgstr ""
 
-#: templates/user_info.html:62 templates/backup/user_info.html:61
+#: templates/user_info.html:62
 msgid "location"
 msgstr ""
 
-#: templates/user_info.html:69 templates/backup/user_info.html:68
+#: templates/user_info.html:69
 msgid "age"
 msgstr ""
 
-#: templates/user_info.html:70 templates/backup/user_info.html:69
+#: templates/user_info.html:70
 msgid "age unit"
-msgstr ""
+msgstr "years old"
 
-#: templates/user_info.html:75 templates/backup/user_info.html:74
+#: templates/user_info.html:76
 msgid "todays unused votes"
 msgstr ""
 
-#: templates/user_info.html:76 templates/backup/user_info.html:75
+#: templates/user_info.html:77
 msgid "votes left"
 msgstr ""
 
-#: templates/user_stats.html:15 templates/backup/user_stats.html:14
+#: templates/user_preferences.html:10
+msgid "Connect with Twitter"
+msgstr ""
+
+#: templates/user_preferences.html:12
+msgid "Twitter account name:"
+msgstr ""
+
+#: templates/user_preferences.html:14
+msgid "Twitter password:"
+msgstr ""
+
+#: templates/user_preferences.html:16
+msgid "Send my Questions to Twitter"
+msgstr ""
+
+#: templates/user_preferences.html:17
+msgid "Send my Answers to Twitter"
+msgstr ""
+
+#: templates/user_preferences.html:18
+msgid "Save"
+msgstr ""
+
+#: templates/user_stats.html:15
 msgid "User questions"
 msgstr ""
 
@@ -2067,198 +1985,268 @@ msgstr ""
 msgid "the answer has been voted for %(vote_count)s times"
 msgstr ""
 
-#: templates/user_stats.html:37 templates/backup/user_stats.html:36
+#: templates/user_stats.html:37
 msgid "this answer has been selected as correct"
 msgstr ""
 
-#: templates/user_stats.html:43 templates/backup/user_stats.html:42
+#: templates/user_stats.html:43
 #, python-format
 msgid "the answer has been commented %(answered_question.comment_count)s times"
 msgstr ""
 
-#: templates/user_stats.html:56 templates/backup/user_stats.html:55
+#: templates/user_stats.html:56
 msgid "votes total"
 msgstr "Votes"
 
-#: templates/user_stats.html:65 templates/backup/user_stats.html:64
+#: templates/user_stats.html:65
 msgid "user has voted up this many times"
 msgstr ""
 
-#: templates/user_stats.html:70 templates/backup/user_stats.html:69
+#: templates/user_stats.html:70
 msgid "user voted down this many times"
 msgstr ""
 
-#: templates/user_stats.html:84 templates/backup/user_stats.html:83
+#: templates/user_stats.html:84
 msgid "Tags"
 msgstr ""
 
-#: templates/user_stats.html:94 templates/backup/user_stats.html:93
+#: templates/user_stats.html:94
 #, python-format
 msgid "see other questions tagged '%(tag)s' "
 msgstr ""
 
-#: templates/user_tabs.html:7 templates/backup/user_tabs.html:6
+#: templates/user_tabs.html:7
 msgid "User profile"
 msgstr ""
 
-#: templates/user_tabs.html:16 templates/backup/user_tabs.html:15
+#: templates/user_tabs.html:16
 msgid "graph of user reputation"
 msgstr ""
 
-#: templates/user_tabs.html:17 templates/backup/user_tabs.html:16
+#: templates/user_tabs.html:17
 msgid "reputation history"
 msgstr ""
 
-#: templates/user_tabs.html:24 templates/backup/user_tabs.html:23
+#: templates/user_tabs.html:24
 msgid "favorites"
 msgstr ""
 
-#: templates/user_tabs.html:29 templates/backup/user_tabs.html:28
+#: templates/user_tabs.html:28
 msgid "settings"
 msgstr ""
 
 #: templates/users.html:6 templates/users.html.py:24
-#: templates/backup/users.html:5 templates/backup/users.html.py:23
 msgid "Users"
 msgstr ""
 
-#: templates/users.html:27 templates/backup/users.html:26
+#: templates/users.html:27
 msgid "recent"
 msgstr ""
 
-#: templates/users.html:28 templates/backup/users.html:27
+#: templates/users.html:28
 msgid "oldest"
 msgstr ""
 
-#: templates/users.html:29 templates/backup/users.html:28
+#: templates/users.html:29
 msgid "by username"
 msgstr ""
 
-#: templates/users.html:35 templates/backup/users.html:34
+#: templates/users.html:35
 #, python-format
 msgid "users matching query %(suser)s:"
 msgstr ""
 
-#: templates/users.html:39 templates/backup/users.html:38
+#: templates/users.html:39
 msgid "Nothing found."
 msgstr ""
 
-#: templates/users_questions.html:11 templates/backup/users_questions.html:10
+#: templates/users_questions.html:11
 msgid "this questions was selected as favorite"
 msgstr ""
 
-#: templates/users_questions.html:33 templates/backup/users_questions.html:32
+#: templates/users_questions.html:33
 msgid "this answer has been accepted to be correct"
 msgstr ""
 
-#: templates/authopenid/changeemail.html:6
-msgid "Account: change email"
-msgstr ""
+#: templates/authopenid/changeemail.html:7
+#: templates/authopenid/changeemail.html:33
+msgid "Change email"
+msgstr "Change Email"
 
-#: templates/authopenid/changeemail.html:9
-msgid ""
-"This is where you can change the email address associated with your account. "
-"Please keep this email address up to date so we can send you a password-"
-"reset email if you request one."
+#: templates/authopenid/changeemail.html:10
+#, python-format
+msgid "change %(email)s info"
 msgstr ""
+"<span class=\"strong big\">Enter your new email into the box below</span> if "
+"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:11
-#: templates/authopenid/changeopenid.html:13
-#: templates/authopenid/changepw.html:18 templates/authopenid/delete.html:14
-#: templates/authopenid/delete.html:24
+#: 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:"
 msgstr ""
 
-#: templates/authopenid/changeemail.html:28
-msgid "Email"
+#: templates/authopenid/changeemail.html:30
+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:29
-#: templates/authopenid/signin.html:59
+#: templates/authopenid/changeemail.html:31
+#: templates/authopenid/signin.html:138
 msgid "Password"
 msgstr ""
 
-#: templates/authopenid/changeemail.html:31
-msgid "Change email"
+#: templates/authopenid/changeemail.html:42
+msgid "Validate email"
+msgstr ""
+
+#: templates/authopenid/changeemail.html:45
+#, python-format
+msgid "validate %(email)s info"
+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\">NMR Wiki Q&A</span>. If you would like to "
+"use <strong>another email</strong>, please <a href=\"/email/change/"
+"\"><strong>change it again</strong></a>."
+
+#: templates/authopenid/changeemail.html:50
+msgid "Email not changed"
+msgstr ""
+
+#: templates/authopenid/changeemail.html:53
+#, python-format
+msgid "old %(email)s kept"
+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."
+
+#: templates/authopenid/changeemail.html:58
+msgid "Email changed"
 msgstr ""
 
-#: templates/authopenid/changeopenid.html:7
+#: templates/authopenid/changeemail.html:61
+#, python-format
+msgid "your current %(email)s can be used for this"
+msgstr ""
+"<span class='big strong'>Your email address is now set to %(email)s.</span> "
+"Updates on the questions that you like most will be sent to this address. "
+"Email notifications are sent once a day or less frequently - only when there "
+"are any news."
+
+#: templates/authopenid/changeemail.html:66
+msgid "Email verified"
+msgstr ""
+
+#: templates/authopenid/changeemail.html:69
+msgid "thanks for verifying email"
+msgstr ""
+"<span class=\"big strong\">Thank you for verifying your email!</span> Now "
+"you can <strong>ask</strong> and <strong>answer</strong> questions. Also if "
+"you find a very interesting question you can <strong>subscribe for the "
+"updates</strong> - then will be notified about changes <strong>once a day</"
+"strong> or less frequently."
+
+#: templates/authopenid/changeemail.html:74
+msgid "email key not sent"
+msgstr "Validation email not sent"
+
+#: templates/authopenid/changeemail.html:77
+#, python-format
+msgid "email key not sent %(email)s change email here %(change_link)s"
+msgstr ""
+"<span class='big strong'>Your current email address %(email)s has been "
+"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:8
 msgid "Account: change OpenID URL"
 msgstr ""
 
-#: templates/authopenid/changeopenid.html:11
+#: templates/authopenid/changeopenid.html:12
 msgid ""
 "This is where you can change your OpenID URL. Make sure you remember it!"
 msgstr ""
 
-#: templates/authopenid/changeopenid.html:28
+#: templates/authopenid/changeopenid.html:29
 msgid "OpenID URL:"
 msgstr ""
 
-#: templates/authopenid/changeopenid.html:29
+#: templates/authopenid/changeopenid.html:30
 msgid "Change OpenID"
 msgstr ""
 
-#: templates/authopenid/changepw.html:13
+#: templates/authopenid/changepw.html:14
 msgid "Account: change password"
 msgstr ""
 
-#: templates/authopenid/changepw.html:16
+#: templates/authopenid/changepw.html:17
 msgid "This is where you can change your password. Make sure you remember it!"
 msgstr ""
 
-#: templates/authopenid/changepw.html:26
+#: templates/authopenid/changepw.html:27
 msgid "Current password"
 msgstr ""
 
-#: templates/authopenid/changepw.html:27
+#: templates/authopenid/changepw.html:28
 msgid "New password"
 msgstr ""
 
-#: templates/authopenid/changepw.html:28
+#: templates/authopenid/changepw.html:29
 msgid "New password again"
 msgstr ""
 
-#: templates/authopenid/changepw.html:29 templates/authopenid/settings.html:28
+#: templates/authopenid/changepw.html:30 templates/authopenid/settings.html:29
 msgid "Change password"
 msgstr ""
 
-#: templates/authopenid/complete.html:4
+#: templates/authopenid/complete.html:5
 msgid "Connect your OpenID with this site"
-msgstr ""
+msgstr "New user signup"
 
-#: templates/authopenid/complete.html:7
+#: templates/authopenid/complete.html:8
 msgid "Connect your OpenID with your account on this site"
-msgstr ""
+msgstr "New user signup"
 
-#: templates/authopenid/complete.html:10
-msgid "Your OpenID is accepted. Please complete this to finish registration."
+#: templates/authopenid/complete.html:12
+#, python-format
+msgid "register new %(provider)s account info"
 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>."
 
-#: templates/authopenid/complete.html:11
+#: templates/authopenid/complete.html:14
 msgid "This account already exists, please use another."
 msgstr ""
 
-#: templates/authopenid/complete.html:16 templates/authopenid/complete.html:29
-#: templates/authopenid/signin.html:42
+#: templates/authopenid/complete.html:19 templates/authopenid/complete.html:32
+#: templates/authopenid/signin.html:121
 msgid "Sorry, looks like we have some errors:"
 msgstr ""
 
-#: templates/authopenid/complete.html:45
-msgid "New account"
-msgstr ""
-
-#: templates/authopenid/complete.html:46
-msgid "User name (<i>will be shown to others, cannot be modified</i>)"
-msgstr ""
-
 #: templates/authopenid/complete.html:47
-msgid "Email (<i>not shared with anyone</i>)"
-msgstr ""
+msgid "Screen name label"
+msgstr "<strong>Screen Name</strong> (<i>will be shown to others</i>)"
 
 #: templates/authopenid/complete.html:48
-msgid "create account"
+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
+msgid "create account"
+msgstr "Signup"
 
 #: templates/authopenid/complete.html:56
 msgid "Existing account"
@@ -2276,265 +2264,328 @@ msgstr ""
 msgid "Register"
 msgstr ""
 
-#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:61
+#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:140
 msgid "Forgot your password?"
 msgstr ""
 
-#: templates/authopenid/delete.html:8
+#: 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 ""
+
+#: templates/authopenid/confirm_email.txt:7
+#: templates/authopenid/delete.html:20
+msgid "Password:"
+msgstr ""
+
+#: 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 ""
 
-#: templates/authopenid/delete.html:12
+#: templates/authopenid/delete.html:13
 msgid ""
 "Note: After deleting your account, anyone will be able to register this "
 "username."
 msgstr ""
 
-#: templates/authopenid/delete.html:16
+#: templates/authopenid/delete.html:17
 msgid "Check confirm box, if you want delete your account."
 msgstr ""
 
-#: templates/authopenid/delete.html:19
-msgid "Password:"
-msgstr ""
-
-#: templates/authopenid/delete.html:31
+#: templates/authopenid/delete.html:32
 msgid "I am sure I want to delete my account."
 msgstr ""
 
-#: templates/authopenid/delete.html:32
+#: templates/authopenid/delete.html:33
 msgid "Password/OpenID URL"
 msgstr ""
 
-#: templates/authopenid/delete.html:32
+#: templates/authopenid/delete.html:33
 msgid "(required for your security)"
 msgstr ""
 
-#: templates/authopenid/delete.html:34
+#: templates/authopenid/delete.html:35
 msgid "Delete account permanently"
 msgstr ""
 
-#: templates/authopenid/sendpw.html:3 templates/authopenid/sendpw.html.py:7
+#: 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 ""
 
-#: templates/authopenid/sendpw.html:11
+#: templates/authopenid/sendpw.html:12
 msgid "Lost your password? No problem - here you can reset it."
 msgstr ""
 
-#: templates/authopenid/sendpw.html:12
+#: 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:29
+#: templates/authopenid/sendpw.html:28
+msgid "User name"
+msgstr ""
+
+#: templates/authopenid/sendpw.html:30
 msgid "Reset password"
 msgstr ""
 
-#: templates/authopenid/sendpw.html:29
+#: templates/authopenid/sendpw.html:30
 msgid "return to login"
 msgstr ""
 
-#: templates/authopenid/sendpw.html:32
+#: 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/settings.html:29
-msgid "Give your  account a new password."
+#: 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
+msgid "New password:"
+msgstr ""
+
+#: 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 "Change email "
+msgid "Give your  account a new password."
 msgstr ""
 
 #: templates/authopenid/settings.html:31
+msgid "Change email "
+msgstr ""
+
+#: templates/authopenid/settings.html:32
 msgid "Add or update the email address associated with your account."
 msgstr ""
 
-#: templates/authopenid/settings.html:34
+#: templates/authopenid/settings.html:35
 msgid "Change openid associated to your account"
 msgstr ""
 
-#: templates/authopenid/settings.html:37
+#: templates/authopenid/settings.html:38
 msgid "Delete account"
 msgstr ""
 
-#: templates/authopenid/settings.html:38
+#: templates/authopenid/settings.html:39
 msgid "Erase your username and all your data from website"
 msgstr ""
 
-#: templates/authopenid/signin.html:3 templates/authopenid/signin.html:16
+#: templates/authopenid/signin.html:4 templates/authopenid/signin.html:21
 msgid "User login"
+msgstr "User login"
+
+#: templates/authopenid/signin.html:28
+#, python-format
+msgid ""
+"\n"
+"                Your answer to %(title)s %(summary)s will be posted once you "
+"log in\n"
+"                "
 msgstr ""
+"\n"
+"<span class=\"strong big\">Your answer to </span> <i>\"<strong>%(title)s</"
+"strong> %(summary)s...\"</i> <span class=\"strong big\">is saved and will be "
+"posted once you log in.</span>"
 
-#: templates/authopenid/signin.html:21
-msgid "we support two login modes"
+#: templates/authopenid/signin.html:35
+#, python-format
+msgid ""
+"Your question \n"
+"                %(title)s %(summary)s will be posted once you log in\n"
+"                "
 msgstr ""
-"You can log in either through one of these services or traditionally - using "
-"local username/password."
+"<span class=\"strong big\">Your question</span> <i>\"<strong>%(title)s</"
+"strong> %(summary)s...\"</i> <span class=\"strong big\">is saved and will be "
+"posted once you log in.</span>"
 
-#: templates/authopenid/signin.html:26 templates/authopenid/signup.html:49
-msgid "Login with your OpenID"
+#: templates/authopenid/signin.html:40
+msgid "Click to sign in through any of these services."
 msgstr ""
+"<p><span class=\"big strong\">We accept <a href=\"http://openid.net"
+"\">OpenID</a> login.</span> <font color=\"gray\">Instead of creating a new "
+"password - log in through any of the services below.<p><span class=\"big "
+"strong\">1. Select the login service by clicking one of the icons</span></p>"
 
-#: templates/authopenid/signin.html:28
-msgid "select openid provider"
-msgstr "1) Please select your id service provider."
+#: templates/authopenid/signin.html:103
+msgid "Enter your <span id=\"enter_your_what\">Provider user name</span>"
+msgstr ""
+"<span class=\"big strong\">2. Enter your <span id=\"enter_your_what"
+"\">Provider user name</span></span><br>(or select another OpenID provider "
+"above)"
 
-#: templates/authopenid/signin.html:32
-msgid "verify openid link and login"
+#: templates/authopenid/signin.html:110
+msgid ""
+"Enter your <a class=\"openid_logo\" href=\"http://openid.net\">OpenID</a> "
+"web address"
 msgstr ""
-"2) Please verify the OpenID URL (type your login name over {username}, if present)"
-" and then log in."
+"<span class=\"big strong\">2. Enter your <a class=\"openid_logo\" href="
+"\"http://openid.net\">OpenID</a> web address</span><br>(or choose specific "
+"provider by clicking on one of the icons above)"
 
-#: templates/authopenid/signin.html:57
+#: templates/authopenid/signin.html:112 templates/authopenid/signin.html:139
+msgid "Login"
+msgstr ""
+
+#: templates/authopenid/signin.html:116
+msgid "we support two login modes"
+msgstr ""
+"You can log in either through one of these services or traditionally - using "
+"local username/password."
+
+#: templates/authopenid/signin.html:136
 msgid "Use login name and password"
 msgstr ""
 
-#: templates/authopenid/signin.html:58
+#: templates/authopenid/signin.html:137
 msgid "Login name"
 msgstr ""
 
-#: templates/authopenid/signin.html:62
-msgid "Create new acccount"
+#: templates/authopenid/signin.html:141
+msgid "Create new account"
 msgstr ""
 
-#: templates/authopenid/signin.html:71
+#: templates/authopenid/signin.html:150
 msgid "Why use OpenID?"
 msgstr ""
 
-#: templates/authopenid/signin.html:75
+#: templates/authopenid/signin.html:154
 msgid "with openid it is easier"
 msgstr "With the OpenID you don't need to create new username and password."
 
-#: templates/authopenid/signin.html:78
+#: templates/authopenid/signin.html:157
 msgid "reuse openid"
 msgstr "You can safely re-use the same login for all OpenID-enabled websites."
 
-#: templates/authopenid/signin.html:81
+#: templates/authopenid/signin.html:160
 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:84
+#: templates/authopenid/signin.html:163
 msgid "openid is supported open standard"
 msgstr "OpenID is based on an open standard, supported by many organizations."
 
-#: templates/authopenid/signin.html:88
+#: templates/authopenid/signin.html:167
 msgid "Find out more"
 msgstr ""
 
-#: templates/authopenid/signin.html:89
+#: templates/authopenid/signin.html:168
 msgid "Get OpenID"
 msgstr ""
 
-#: templates/authopenid/signup.html:2 templates/authopenid/signup.html.py:6
+#: templates/authopenid/signup.html:4 templates/authopenid/signup.html.py:8
 msgid "Signup"
 msgstr ""
 
-#: templates/authopenid/signup.html:10
+#: templates/authopenid/signup.html:12
 msgid ""
 "We support two types of user registration: conventional username/password, "
 "and"
 msgstr ""
 
-#: templates/authopenid/signup.html:10
+#: templates/authopenid/signup.html:12
 msgid "the OpenID method"
 msgstr ""
 
-#: templates/authopenid/signup.html:15
+#: templates/authopenid/signup.html:17
 msgid "Sorry, looks like we have some errors"
 msgstr ""
 
-#: templates/authopenid/signup.html:33
+#: templates/authopenid/signup.html:35
 msgid "Conventional registration"
 msgstr ""
 
-#: templates/authopenid/signup.html:34
+#: templates/authopenid/signup.html:36
 msgid "choose a user name"
 msgstr ""
 
-#: templates/authopenid/signup.html:40
+#: templates/authopenid/signup.html:42
 msgid "back to login"
 msgstr ""
 
-#: templates/authopenid/signup.html:46
+#: templates/authopenid/signup.html:48
 msgid "Register with your OpenID"
 msgstr ""
 
-#
-#: templates/backup/answer_edit_tips.html:3
-#: templates/backup/question_edit_tips.html:2
-msgid "editing tips"
-msgstr "Tips"
-
-#: templates/backup/questions.html:108
-msgid "number of questions"
-msgstr ""
-
-#: templates/backup/questions.html:110
-msgid "tagged with"
-msgstr ""
-
-#: templates/backup/questions.html:116
-msgid "whose title contains"
-msgstr ""
-
-#: templates/backup/questions.html:121
-msgid "number of questions end of sentence."
-msgstr ""
-
-#: templates/backup/questions.html:123
-msgid "Questions are sorted by <strong>entry date</strong>."
-msgstr ""
-
-#: templates/backup/questions.html:123
-msgid "Newest questions shown first."
-msgstr ""
-"Questions are sorted by <strong>entry date</strong>.Newest questions shown "
-"first."
-
-#: templates/backup/unanswered.html:98 templates/tough/unanswered.html:95
-msgid "number of <strong>unanswered</strong> questions"
-msgstr ""
-
-#: templates/backup/user_info.html:44
-msgid "member since"
-msgstr ""
-
-#: templates/backup/user_stats.html:36
-#, python-format
-msgid "the answer has been voted for %(answered_question.vote_count)s times"
+#: templates/authopenid/signup.html:51
+msgid "Login with your OpenID"
 msgstr ""
 
-#: templates/tough/question_retag.html:2
-msgid "Revise tags"
-msgstr ""
+#~ msgid "what is this website"
+#~ msgstr ""
+#~ "This is a collaboratively edited question and answer site for the "
+#~ "Magnetic Resonance specialists."
 
-#: templates/tough/question_retag.html:37
-msgid "tags are requried"
-msgstr ""
-
-#: templates/tough/question_retag.html:38
-msgid "up to 5 tags, less than 20 characters each"
-msgstr ""
+#
+#~ msgid "editing tips"
+#~ msgstr "Tips"
 
-#: templates/tough/question_retag.html:51
-msgid "Change tags"
-msgstr ""
+#~ msgid "Newest questions shown first."
+#~ msgstr ""
+#~ "Questions are sorted by <strong>entry date</strong>.Newest questions "
+#~ "shown first."
 
-#: templates/tough/question_retag.html:74
-msgid "Change now"
-msgstr ""
+#~ msgid ""
+#~ "please use space to separate tags (this enables autocomplete feature)"
+#~ msgstr "please use space to separate tags (uses autocomplete utility)"
 
-#: templates/tough/question_retag.html:85
-msgid "Why use and modify tags?"
-msgstr ""
+#~ msgid "select openid provider"
+#~ msgstr "1) Please select your id service provider."
 
-#: templates/tough/question_retag.html:96
-msgid "tag editors receive special awards from the community"
-msgstr ""
+#~ 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
deleted file mode 100644
index 7e934ecf..00000000
--- a/locale/es/LC_MESSAGES/django.mo
+++ /dev/null
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 6801907c..a8ac642a 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-23 01:11-0300\n"
+"POT-Creation-Date: 2009-08-05 22:28-0400\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"
@@ -15,19 +15,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: settings.py:27
+#: settings.py:12
 msgid "account/"
 msgstr "cuenta/"
 
-#: settings.py:27 django_authopenid/urls.py:9 django_authopenid/urls.py:11
+#: settings.py:12 django_authopenid/urls.py:9 django_authopenid/urls.py:10
+#: django_authopenid/urls.py:11 django_authopenid/urls.py:13
+#: forum/views.py:304 templates/authopenid/confirm_email.txt:10
 msgid "signin/"
 msgstr "ingresar/"
 
-#: django_authopenid/forms.py:67 django_authopenid/views.py:93
+#: django_authopenid/forms.py:67 django_authopenid/views.py:102
 msgid "i-names are not supported"
 msgstr "i-names no son soportados"
 
-#: django_authopenid/forms.py:102 django_authopenid/forms.py:207
+#: django_authopenid/forms.py:102
 msgid ""
 "Usernames can only contain                     letters, numbers and "
 "underscores"
@@ -42,7 +44,7 @@ msgstr ""
 "Este nombre de usuario no existe en nuestra base de datos. Por favor elija "
 "otro."
 
-#: django_authopenid/forms.py:126 django_authopenid/forms.py:231
+#: 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."
@@ -50,11 +52,11 @@ msgstr ""
 "Por favor ingrese un usuario y contraseña validos. Ambos campos son "
 "sensibles a mayúsculas y minúsculas."
 
-#: django_authopenid/forms.py:130 django_authopenid/forms.py:235
+#: django_authopenid/forms.py:130 django_authopenid/forms.py:237
 msgid "This account is inactive."
 msgstr "Esta cuenta esta inactiva."
 
-#: django_authopenid/forms.py:158
+#: django_authopenid/forms.py:158 django_authopenid/forms.py:210
 msgid "invalid user name"
 msgstr "nombre de usuario no valido"
 
@@ -71,126 +73,136 @@ msgstr "nombre de usuario muy corto"
 msgid "this name is already in use - please try anoter"
 msgstr "este nombre ya está tomado - por favor intente con otro"
 
-#: django_authopenid/forms.py:184
+#: django_authopenid/forms.py:185
 msgid ""
-"This email is already                 registered in our database. Please "
-"choose another."
+"This email is already                         registered in our database. "
+"Please choose another."
 msgstr ""
 "Este email ya está registrado en nuestra base de datos. Por favor, intente "
 "con otro."
 
-#: django_authopenid/forms.py:214
+#: django_authopenid/forms.py:216
 msgid ""
 "This username don't exist.                         Please choose another."
 msgstr "Este nombre de usuario no existe, por favor ingrese otro."
 
-#: django_authopenid/forms.py:253
+#: django_authopenid/forms.py:255
 msgid "choose a username"
 msgstr "elija un nombre de usuario"
 
-#: django_authopenid/forms.py:255 templates/authopenid/signup.html:36
+#: django_authopenid/forms.py:257 templates/authopenid/signup.html:38
 msgid "your email address"
 msgstr "su email (correo electrónico)"
 
-#: django_authopenid/forms.py:257 templates/authopenid/signup.html:37
+#: django_authopenid/forms.py:259 templates/authopenid/signup.html:39
 msgid "choose password"
 msgstr "elija una contraseña"
 
-#: django_authopenid/forms.py:259 templates/authopenid/signup.html:38
+#: django_authopenid/forms.py:261 templates/authopenid/signup.html:40
 msgid "retype password"
 msgstr "re-ingrese la contraseña"
 
-#: django_authopenid/forms.py:330
+#: django_authopenid/forms.py:335
 msgid ""
 "Old password is incorrect.                     Please enter the correct "
 "password."
 msgstr "La antigua contraseña es incorrecta. Por favor ingrese la correcta"
 
-#: django_authopenid/forms.py:342
+#: django_authopenid/forms.py:347
 msgid "new passwords do not match"
 msgstr "la nueva contraseña no coincide"
 
-#: django_authopenid/forms.py:434
+#: django_authopenid/forms.py:442
 msgid "Incorrect username."
 msgstr "Nombre de usuario incorrecto"
 
 #: django_authopenid/urls.py:10
+#, fuzzy
+msgid "newquestion/"
+msgstr "pregunta"
+
+#: django_authopenid/urls.py:11
+#, fuzzy
+msgid "newanswer/"
+msgstr "resputa"
+
+#: django_authopenid/urls.py:12
 msgid "signout/"
 msgstr "salir/"
 
-#: django_authopenid/urls.py:11
+#: django_authopenid/urls.py:13
 msgid "complete/"
 msgstr "completado/"
 
-#: django_authopenid/urls.py:13
+#: django_authopenid/urls.py:15
 msgid "register/"
 msgstr "registrarse/"
 
-#: django_authopenid/urls.py:14
+#: django_authopenid/urls.py:16
 msgid "signup/"
 msgstr "registrarse/"
 
-#: django_authopenid/urls.py:16
+#: django_authopenid/urls.py:18
 msgid "sendpw/"
 msgstr "enviarcontrasena/"
 
-#: django_authopenid/urls.py:26
+#: django_authopenid/urls.py:29
 msgid "delete/"
 msgstr "borrar/"
 
-#: django_authopenid/views.py:99
+#: django_authopenid/views.py:108
 #, python-format
-msgid "非法OpenID地址： %s"
+msgid "OpenID %(openid_url)s is invalid"
 msgstr ""
 
-#: django_authopenid/views.py:366
+#: django_authopenid/views.py:417 django_authopenid/views.py:544
 msgid "Welcome"
 msgstr "Bienvenido"
 
-#: django_authopenid/views.py:456
+#: django_authopenid/views.py:507
 msgid "Password changed."
 msgstr "Contraseña modificada"
 
-#: django_authopenid/views.py:488
-msgid "Email changed."
-msgstr "Email modificado."
+#: django_authopenid/views.py:519 django_authopenid/views.py:524
+msgid "your email needs to be validated"
+msgstr ""
 
-#: django_authopenid/views.py:519 django_authopenid/views.py:671
+#: django_authopenid/views.py:681 django_authopenid/views.py:833
 #, python-format
 msgid "No OpenID %s found associated in our database"
 msgstr "La OpenID %s no esta asociada en nuestra base de datos"
 
-#: django_authopenid/views.py:523 django_authopenid/views.py:678
+#: django_authopenid/views.py:685 django_authopenid/views.py:840
 #, python-format
 msgid "The OpenID %s isn't associated to current user logged in"
 msgstr "La OpenID %s no esta asociada al usuario actualmente autenticado"
 
-#: django_authopenid/views.py:531
+#: django_authopenid/views.py:693
 msgid "Email Changed."
 msgstr "Email modificado"
 
-#: django_authopenid/views.py:606
+#: django_authopenid/views.py:768
 msgid "This OpenID is already associated with another account."
 msgstr "Esta OpenID ya está asociada a otra cuenta."
 
-#: django_authopenid/views.py:611
+#: django_authopenid/views.py:773
 #, python-format
 msgid "OpenID %s is now associated with your account."
 msgstr "La OpenID %s está ahora asociada con tu cuenta."
 
-#: django_authopenid/views.py:681
+#: django_authopenid/views.py:843
 msgid "Account deleted."
 msgstr "Cuenta borrada."
 
-#: django_authopenid/views.py:721
+#: django_authopenid/views.py:883
 msgid "Request for new password"
 msgstr "Pedir nueva contraseña"
 
-#: django_authopenid/views.py:734
+#: django_authopenid/views.py:896
 msgid "A new password has been sent to your email address."
 msgstr "Una nueva contraseña ha sido enviada a tu cuenta de Email."
 
-#: django_authopenid/views.py:764
+#: django_authopenid/views.py:926
 #, python-format
 msgid ""
 "Could not change password. Confirmation key '%s'                is not "
@@ -199,7 +211,7 @@ msgstr ""
 "No se ha podido modificar la contraseña. La clave de confirmación '%s' no "
 "está registrada"
 
-#: django_authopenid/views.py:773
+#: django_authopenid/views.py:935
 msgid ""
 "Can not change password. User don't exist anymore                 in our "
 "database."
@@ -207,7 +219,7 @@ msgstr ""
 "No se puede cambiar la contraseña. El usuario no existe más en nuestra base "
 "de datos."
 
-#: django_authopenid/views.py:782
+#: django_authopenid/views.py:944
 #, python-format
 msgid "Password changed for %s. You may now sign in."
 msgstr "Contraseña cambiada por %s. Ahora puedes ingresar."
@@ -328,34 +340,21 @@ msgstr "versión inicial"
 msgid "retagged"
 msgstr "re-etiquetada"
 
-#: forum/feed.py:17 templates/base.html:7 templates/base_content.html:6
-#: templates/faq.html:25 templates/faq.html.py:108 templates/tough/faq.html:23
-#: templates/tough/faq.html.py:106 templates/tough/question_retag.html:89
-msgid "site title"
-msgstr "titulo del sitio"
-
-#: forum/feed.py:17
+#: forum/feed.py:18
 msgid " - "
 msgstr " - "
 
-#: forum/feed.py:17 templates/base.html:7 templates/base_content.html:6
-msgid "site slogan"
-msgstr " slogan del sitio"
-
-#: forum/feed.py:17
+#: forum/feed.py:18
 msgid "latest questions"
 msgstr "últimas preguntas"
 
-#: forum/feed.py:20 templates/index.html:8
-msgid "meta site content"
-msgstr "meta descripción"
-
-#: forum/feed.py:22
-msgid "copyright message"
-msgstr "mensaje de copyright"
+#: forum/feed.py:19
+#, fuzzy
+msgid "questions/"
+msgstr "preguntas"
 
 #: forum/forms.py:14 templates/answer_edit_tips.html:34
-#: templates/answer_edit_tips.html.py:39 templates/question_edit_tips.html:31
+#: templates/answer_edit_tips.html.py:38 templates/question_edit_tips.html:31
 #: templates/question_edit_tips.html:36
 msgid "title"
 msgstr "titulo"
@@ -380,25 +379,24 @@ msgstr "el contenido de la pregunta debe ser al menos de 10 caracteres"
 msgid "tags"
 msgstr "etiquetas"
 
-#: forum/forms.py:46
-msgid "please use space to separate tags (this enables autocomplete feature)"
+#: forum/forms.py:47
+msgid ""
+"Tags are short keywords, with no spaces within. Up to five tags can be used."
 msgstr ""
-"por favor utilice espacio para separar las etiquetas (esto habilitael auto-"
-"completado)"
 
-#: forum/forms.py:53
+#: forum/forms.py:54 templates/question_retag.html:38
 msgid "tags are required"
 msgstr "las etiquetas son requeridas"
 
-#: forum/forms.py:57
+#: forum/forms.py:58
 msgid "please use 5 tags or less"
 msgstr "por favor use 5 o menos etiquetas"
 
-#: forum/forms.py:60
+#: forum/forms.py:61
 msgid "tags must be shorter than 20 characters"
 msgstr "las etiquetas deben ser menores a 20 caracteres"
 
-#: forum/forms.py:64
+#: forum/forms.py:65
 msgid ""
 "please use following characters in tags: letters 'a-z', numbers, and "
 "characters '.-_#'"
@@ -406,15 +404,14 @@ msgstr ""
 "por favor use solo los siguientes caracteres en los nombres de etiquetas: "
 "letras 'a-z', números y caracteres '.-_#'"
 
-#: forum/forms.py:74 templates/index.html:56 templates/question.html:196
-#: templates/question.html.py:377 templates/questions.html:58
+#: forum/forms.py:75 templates/index.html:57 templates/question.html:199
+#: templates/question.html.py:380 templates/questions.html:58
 #: templates/questions.html.py:70 templates/unanswered.html:48
-#: templates/unanswered.html.py:60 templates/tough/unanswered.html:46
-#: templates/tough/unanswered.html.py:58
+#: templates/unanswered.html.py:60
 msgid "community wiki"
 msgstr "wiki de comunidad"
 
-#: forum/forms.py:75
+#: forum/forms.py:76
 msgid ""
 "if you choose community wiki option, the question and answer do not generate "
 "points and name of author will not be shown"
@@ -422,11 +419,11 @@ msgstr ""
 "si marca la opción 'wiki de comunidad', la pregunta y respuestas no generan "
 "puntos y el nombre del autor no será mostrado"
 
-#: forum/forms.py:84
+#: forum/forms.py:89
 msgid "update summary:"
 msgstr "resumen de modificación"
 
-#: forum/forms.py:85
+#: forum/forms.py:90
 msgid ""
 "enter a brief summary of your revision (e.g. fixed spelling, grammar, "
 "improved style, this field is optional)"
@@ -434,48 +431,72 @@ 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:160
+#: 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:161
+#: forum/forms.py:176
 msgid "Real name"
 msgstr "Nombre real"
 
-#: forum/forms.py:162
+#: forum/forms.py:177
 msgid "Website"
 msgstr "Sitio Web"
 
-#: forum/forms.py:163
+#: forum/forms.py:178
 msgid "Location"
 msgstr "Ubicación"
 
-#: forum/forms.py:164
+#: forum/forms.py:179
 msgid "Date of birth"
 msgstr "Fecha de nacimiento"
 
-#: forum/forms.py:164
+#: 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:165 templates/base.html:64
-#: templates/authopenid/settings.html:20
+#: forum/forms.py:180 templates/authopenid/settings.html:21
 msgid "Profile"
 msgstr "Perfil"
 
-#: forum/forms.py:190 forum/forms.py:191
+#: 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:316 templates/badges.html:51
+#: forum/models.py:238
+#, fuzzy, python-format
+msgid "%(author)s modified the question"
+msgstr "Cerrar la pregunta"
+
+#: forum/models.py:242
+#, python-format
+msgid "%(people)s posted %(new_answer_count)s new answers"
+msgstr ""
+
+#: forum/models.py:247
+#, fuzzy, python-format
+msgid "%(people)s commented the question"
+msgstr "pregunta comentada"
+
+#: forum/models.py:252
+#, fuzzy, python-format
+msgid "%(people)s commented answers"
+msgstr "respuesta comentada"
+
+#: forum/models.py:254
+#, fuzzy, python-format
+msgid "%(people)s commented the answer"
+msgstr "respuesta comentada"
+
+#: forum/models.py:433 templates/badges.html:52
 msgid "gold"
 msgstr "oro"
 
-#: forum/models.py:317 templates/badges.html:59
+#: forum/models.py:434 templates/badges.html:60
 msgid "silver"
 msgstr "plata"
 
-#: forum/models.py:318 templates/badges.html:66
+#: forum/models.py:435 templates/badges.html:67
 msgid "bronze"
 msgstr "bronze"
 
@@ -555,7 +576,7 @@ msgstr "perfil - votos"
 msgid "preferences"
 msgstr "preferencias"
 
-#: forum/user.py:69 templates/user_tabs.html:28
+#: forum/user.py:69 templates/user_tabs.html:27
 msgid "user preference settings"
 msgstr "preferencias del usuario"
 
@@ -563,28 +584,43 @@ msgstr "preferencias del usuario"
 msgid "profile - user preferences"
 msgstr "perfil - preferencia de "
 
-#: forum/views.py:1730
+#: forum/views.py:304
+#, fuzzy
+msgid "/account/"
+msgstr "cuenta/"
+
+#: forum/views.py:943
+#, python-format
+msgid "subscription saved, %(email)s needs validation"
+msgstr ""
+
+#: forum/views.py:1853
 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:1732
+#: forum/views.py:1855
 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:1734
+#: forum/views.py:1857
 #, python-format
 msgid "maximum upload file size is %sK"
 msgstr "tamaño máximo permitido es archivo %sK"
 
-#: forum/views.py:1736
+#: forum/views.py:1859
 #, python-format
 msgid ""
 "Error uploading file. Please contact the site administrator. Thank you. %s"
 msgstr ""
 "Error al subir el archivo. Por favor, contacte al administrador. Gracias. %s"
 
+#: forum/management/commands/send_email_alerts.py:35
+#, fuzzy
+msgid "updates from website"
+msgstr "sitio web del usuario"
+
 #: forum/templatetags/extra_tags.py:139 forum/templatetags/extra_tags.py:168
 #: templates/header.html:33
 msgid "badges"
@@ -642,6 +678,10 @@ msgstr "ver todas las preguntas"
 msgid "see all tags"
 msgstr "ver todas las tags"
 
+#: templates/500.html:22
+msgid "sorry, system error"
+msgstr ""
+
 #: templates/500.html:24
 msgid "system error log is recorded, error will be fixed as soon as possible"
 msgstr ""
@@ -668,19 +708,19 @@ msgid "Edit answer"
 msgstr "Editar respuesta"
 
 #: templates/answer_edit.html:24 templates/answer_edit.html.py:27
-#: templates/ask.html:25 templates/ask.html.py:28 templates/question.html:37
-#: templates/question.html.py:40 templates/question_edit.html:27
+#: templates/ask.html:25 templates/ask.html.py:28 templates/question.html:40
+#: templates/question.html.py:43 templates/question_edit.html:27
 msgid "hide preview"
 msgstr "ocultar previsualización"
 
 #: templates/answer_edit.html:27 templates/ask.html:28
-#: templates/question.html:40 templates/question_edit.html:27
+#: templates/question.html:43 templates/question_edit.html:27
 msgid "show preview"
 msgstr "ver previsualización"
 
 #: templates/answer_edit.html:47 templates/question_edit.html:65
-#: templates/revisions_answer.html:36 templates/revisions_question.html:36
-#: templates/tough/question_retag.html:51
+#: templates/question_retag.html:52 templates/revisions_answer.html:36
+#: templates/revisions_question.html:36
 msgid "back"
 msgstr "volver"
 
@@ -693,23 +733,25 @@ msgstr "revisión"
 msgid "select revision"
 msgstr "seleccionar revisión"
 
-#: templates/answer_edit.html:62 templates/ask.html:81
-#: templates/question.html:447 templates/question_edit.html:91
+#: templates/answer_edit.html:62 templates/ask.html:94
+#: templates/question.html:452 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:81
-#: templates/question.html:447 templates/question_edit.html:91
+#: templates/answer_edit.html:62 templates/ask.html:94
+#: templates/question.html:452 templates/question_edit.html:91
 msgid "toggle preview"
 msgstr "Activar previsualización"
 
 #: templates/answer_edit.html:73 templates/question_edit.html:119
+#: templates/question_retag.html:75
 msgid "Save edit"
 msgstr "Guardar la edición"
 
 #: templates/answer_edit.html:74 templates/close.html:29
-#: templates/question_edit.html:120 templates/reopen.html:30
-#: templates/user_edit.html:83 templates/tough/question_retag.html:75
+#: templates/question_edit.html:120 templates/question_retag.html:76
+#: templates/reopen.html:30 templates/user_edit.html:83
+#: templates/authopenid/changeemail.html:34
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -753,24 +795,24 @@ msgstr "**negrita** o __negrita__"
 msgid "link"
 msgstr "enlace"
 
-#: templates/answer_edit_tips.html:34 templates/answer_edit_tips.html.py:39
+#: templates/answer_edit_tips.html:34 templates/answer_edit_tips.html.py:38
 #: templates/question_edit_tips.html:31 templates/question_edit_tips.html:36
 msgid "text"
 msgstr "texto"
 
-#: templates/answer_edit_tips.html:39 templates/question_edit_tips.html:36
+#: templates/answer_edit_tips.html:38 templates/question_edit_tips.html:36
 msgid "image"
 msgstr "imagen"
 
-#: templates/answer_edit_tips.html:43 templates/question_edit_tips.html:40
+#: templates/answer_edit_tips.html:42 templates/question_edit_tips.html:40
 msgid "numbered list:"
 msgstr "lista numerada"
 
-#: templates/answer_edit_tips.html:48 templates/question_edit_tips.html:45
+#: templates/answer_edit_tips.html:47 templates/question_edit_tips.html:45
 msgid "basic HTML tags are also supported"
 msgstr "etiquetas básicas de HTML permitidas"
 
-#: templates/answer_edit_tips.html:51 templates/question_edit_tips.html:48
+#: templates/answer_edit_tips.html:50 templates/question_edit_tips.html:48
 msgid "learn more about Markdown"
 msgstr "aprender mas sobre Markdown"
 
@@ -778,32 +820,25 @@ msgstr "aprender mas sobre Markdown"
 msgid "Ask a question"
 msgstr "Hacer una pregunta"
 
-#: templates/ask.html:106
-msgid "Use"
-msgstr "Usar"
-
-#: templates/ask.html:106
-msgid "learn more about OpenID"
-msgstr "aprender mas sobre OpenID"
-
-#: templates/ask.html:106 templates/authopenid/signin.html:35
-#: templates/authopenid/signin.html:61
-msgid "Login"
-msgstr "Ingresar"
+#: templates/ask.html:67
+#, fuzzy
+msgid "login to post question info"
+msgstr "<strong>Más recientes</strong> preguntas son mostradas primero."
 
-#: templates/ask.html:109
-msgid "Get your own "
-msgstr "Obtiene tu propio "
+#: templates/ask.html:73
+#, python-format
+msgid "must have valid %(email)s to post"
+msgstr ""
 
-#: templates/ask.html:117 templates/authopenid/sendpw.html:27
-msgid "User name"
-msgstr "Nombre de usuario"
+#: templates/ask.html:108
+msgid "(required)"
+msgstr ""
 
-#: templates/ask.html:120
-msgid "Email: (won't be shown to anyone)"
-msgstr "Email: (no será mostrado a nadie)"
+#: templates/ask.html:115
+msgid "Login/signup to post your question"
+msgstr ""
 
-#: templates/ask.html:127
+#: templates/ask.html:117
 msgid "Ask your question"
 msgstr "Haz tu pregunta"
 
@@ -824,72 +859,47 @@ msgid "Badges"
 msgstr "Distinciones"
 
 #: templates/badges.html:21
+msgid "Community gives you awards for your questions, answers and votes."
+msgstr "La comunidad te da distinciones por tus preguntas, respuestas y votos."
+
+#: templates/badges.html:22
+#, fuzzy
 msgid ""
-"Community gives you awards for your questions, answers and votes. 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 of times each type of badge "
+"has been awarded."
 msgstr ""
 "La comunidad te condecora con distinciones por tus preguntas, respuestas y "
 "votos. Debajo esta la lista de las distinciones disponibles y la cantidad de "
 "veces que han sido asignadas."
 
-#: templates/badges.html:48
+#: templates/badges.html:49
 msgid "Community badges"
 msgstr "Distinciones de la comunidad"
 
-#: templates/badges.html:54
-msgid ""
-"Gold badge is very rare. To obtain it you have to show profound knowledge "
-"and ability in addition to actively participating in the community. Gold "
-"badge is the highest award in this community."
+#: templates/badges.html:55
+msgid "gold badge description"
 msgstr ""
 "Las distinciones de Oro son excepcionales. Para obtenerla debes demostrar un "
 "profundo conocimiento y habilidad además de participar activamente en la "
 "comunidad. La distinción de Oro es la condecoración máxima en esta comunidad"
 
-#: templates/badges.html:62
-msgid ""
-"Obtaining silver badge requires significant patience. If you got one, you've "
-"very significantly contributed to this community"
+#: templates/badges.html:63
+msgid "silver badge description"
 msgstr ""
 "Obtener una distinción de Plata requiere de paciencia. Si has logrado una, "
 "quiere decir que haz significativamente aportado a esta comunidad."
 
-#: templates/badges.html:65
+#: templates/badges.html:66
 msgid "bronze badge: often given as a special honor"
 msgstr ""
 "distinción de bronce: con frecuencia entregada como reconocimiento especial."
 
-#: templates/badges.html:69
-msgid ""
-"If you are active in this community, you will get this medal - still it is a "
-"special honor."
+#: templates/badges.html:70
+msgid "bronze badge description"
 msgstr ""
 "Si eres un usuario activo de esta comunidad, recibirás esta distinción - de "
 "todas maneras es un honor especial."
 
-#: templates/base.html:62
-#, fuzzy
-msgid "Congratulations! You have new badges: "
-msgstr "felicitaciones, la comunidad te ha otorgado una distinción"
-
-#: templates/base.html:63
-#, fuzzy
-msgid "go to see"
-msgstr "OK para cerrar"
-
-#: templates/base_content.html:61
-msgid "congratulations, community gave you a badge"
-msgstr "felicitaciones, la comunidad te ha otorgado una distinción"
-
-#: templates/base_content.html:62
-msgid "see"
-msgstr "ver"
-
-#: templates/base_content.html:63
-msgid "profile"
-msgstr "perfil"
-
 #: templates/book.html:7
 msgid "reading channel"
 msgstr "canal de lectura"
@@ -956,9 +966,8 @@ msgstr "esta pregunta ha sido seleccionada como favorita"
 msgid "number of times"
 msgstr "numero de veces"
 
-#: templates/book.html:105 templates/index.html:47 templates/questions.html:46
+#: templates/book.html:105 templates/index.html:48 templates/questions.html:46
 #: templates/unanswered.html:37 templates/users_questions.html:30
-#: templates/tough/unanswered.html:35
 msgid "votes"
 msgstr "votos"
 
@@ -966,18 +975,16 @@ msgstr "votos"
 msgid "the answer has been accepted to be correct"
 msgstr "la respuesta ha sido aceptada como correcta"
 
-#: templates/book.html:115 templates/index.html:48 templates/questions.html:47
+#: templates/book.html:115 templates/index.html:49 templates/questions.html:47
 #: templates/unanswered.html:38 templates/users_questions.html:40
-#: templates/tough/unanswered.html:36
 msgid "views"
 msgstr "vistas"
 
-#: templates/book.html:125 templates/index.html:68 templates/question.html:112
-#: templates/question.html.py:479 templates/questions.html:84
-#: templates/questions.html.py:149 templates/tags.html:47
+#: templates/book.html:125 templates/index.html:69 templates/question.html:115
+#: templates/question.html.py:486 templates/questions.html:84
+#: templates/questions.html.py:156 templates/tags.html:47
 #: templates/unanswered.html:75 templates/unanswered.html.py:109
-#: templates/users_questions.html:52 templates/tough/unanswered.html:72
-#: templates/tough/unanswered.html:105
+#: templates/users_questions.html:52
 msgid "using tags"
 msgstr "usando etiquetas"
 
@@ -1005,15 +1012,15 @@ msgstr "Razón"
 msgid "OK to close"
 msgstr "OK para cerrar"
 
-#: templates/faq.html:11 templates/tough/faq.html:9
+#: templates/faq.html:11
 msgid "Frequently Asked Questions "
 msgstr "Preguntas Frecuentes"
 
-#: templates/faq.html:15 templates/tough/faq.html:13
+#: templates/faq.html:16
 msgid "What kinds of questions can I ask here?"
 msgstr "¿Qué clase de preguntas puedo hacer aquí?"
 
-#: templates/faq.html:16 templates/tough/faq.html:14
+#: templates/faq.html:17
 msgid ""
 "Most importanly - questions should be <strong>relevant</strong> to this "
 "community."
@@ -1021,7 +1028,7 @@ msgstr ""
 "Por encima de todo - las preguntas deben ser <strong>relevantes</strong>a "
 "esta comunidad."
 
-#: templates/faq.html:17 templates/tough/faq.html:15
+#: templates/faq.html:18
 msgid ""
 "Before asking the question - please make sure to use search to see whether "
 "your question has alredy been answered."
@@ -1029,11 +1036,11 @@ msgstr ""
 "Antes de hacer tu pregunta - por favor usa el buscador para asegurarte que "
 "la pregunta no este ya hecha."
 
-#: templates/faq.html:20 templates/tough/faq.html:18
+#: templates/faq.html:21
 msgid "What questions should I avoid asking?"
 msgstr "¿Qué preguntas debería evitar preguntar?"
 
-#: templates/faq.html:21 templates/tough/faq.html:19
+#: templates/faq.html:22
 msgid ""
 "Please avoid asking questions that are not relevant to this community, too "
 "subjective and argumentative."
@@ -1041,11 +1048,15 @@ msgstr ""
 "Evita hacer preguntas que no son relevantes a la comunidad, demasiado "
 "subjetivas o argumentativas."
 
-#: templates/faq.html:24 templates/tough/faq.html:22
+#: templates/faq.html:27
 msgid "What should I avoid in my answers?"
 msgstr "¿Que debo evitar en mis respuestas?"
 
-#: templates/faq.html:25 templates/tough/faq.html:23
+#: templates/faq.html:28 templates/faq.html.py:132
+msgid "site title"
+msgstr "titulo del sitio"
+
+#: templates/faq.html:28
 msgid ""
 "is a Q&A site, not a discussion group. Therefore - please avoid having "
 "discussions in your answers, comment facility allows some space for brief "
@@ -1055,19 +1066,19 @@ msgstr ""
 "intenta evitar discusiones en tus respuestas. Los comentarios permiten "
 "realizar pequeñas discusiones."
 
-#: templates/faq.html:28 templates/tough/faq.html:26
+#: templates/faq.html:32
 msgid "Who moderates this community?"
 msgstr "¿Quién modera esta comunidad?"
 
-#: templates/faq.html:29 templates/tough/faq.html:27
+#: templates/faq.html:33
 msgid "The short answer is: <strong>you</strong>."
 msgstr "La respuesta corta es: <strong>tú</strong>"
 
-#: templates/faq.html:30 templates/tough/faq.html:28
+#: templates/faq.html:34
 msgid "This website is moderated by the users."
 msgstr "Este sitio es moderado por los usuarios."
 
-#: templates/faq.html:31 templates/tough/faq.html:29
+#: templates/faq.html:35
 msgid ""
 "The reputation system allows users earn the authorization to perform a "
 "variety of moderation tasks."
@@ -1075,120 +1086,83 @@ msgstr ""
 "El sistema de reputación permite a los usuarios adquirir autorización para "
 "realizar diversas tareas de moderación."
 
-#: templates/faq.html:34 templates/tough/faq.html:32
+#: templates/faq.html:40
 msgid "How does reputation system work?"
 msgstr "¿Cómo funciona el sistema de reputación?"
 
-#: templates/faq.html:35 templates/tough/faq.html:33
-msgid ""
-"Anyone can ask questions and give answers, points are not necessary for that."
-msgstr ""
-"Cualquier usuario puede hacer preguntas y dar respuestas, no es necesario "
-"tener reputación para ello."
-
-#: templates/faq.html:36 templates/tough/faq.html:34
-msgid ""
-"As we've said before, users help running this site. Point system helps "
-"select users who can administer this community."
-msgstr ""
-"Como dijimos antes, los usuarios ayudan a crear este sitio. El sistema de "
-"reputación permite seleccionar usuarios que pueden moderar esta comunidad."
-
-#: templates/faq.html:37 templates/tough/faq.html:35
-msgid ""
-"Reputation points roughly measure how community trusts you. These points are "
-"given to you directly by other members of the community."
-msgstr ""
-"Los puntos de reputación miden a groso modo que tan respetado eres en la "
-"comunidad. Los puntos son dados a ti directamente por otros miembros de la "
-"comunidad"
-
-#: templates/faq.html:40 templates/tough/faq.html:38
-msgid ""
-"For example, if you ask an interesting question or give a helpful answer, "
-"your input will be upvoted and you will gain more trust in the community."
-msgstr ""
-"Por ejemplo, si haces una pregunta interesante, o das una respuesta valiosa, "
-"tu entrada va a ser votada positivamente y tu ganarás confianza en la "
-"comunidad."
-
-#: templates/faq.html:41 templates/tough/faq.html:39
-msgid ""
-"If on the other hand someone gives a misleading answer, the answer will be "
-"voted down and he/she loses some points."
-msgstr ""
-"Si por el contrario, alguien da una respuesta que no corresponde, la "
-"respuesta será votada negativamente y el usuario perderá puntos."
-
-#: templates/faq.html:42 templates/tough/faq.html:40
-msgid ""
-"Each vote in favor will generate <strong>10</strong> points, each vote "
-"against will subtract <strong>2</strong> points."
-msgstr ""
-"Cada voto a favor generará <strong>10</strong> puntos, cada voto negativo "
-"restará <strong>2</strong> puntos."
-
-#: templates/faq.html:43 templates/tough/faq.html:41
-msgid ""
-"Through the votes of other people you can accumulate a maximum of "
-"<strong>200</strong> points."
-msgstr ""
-"A través del voto de otras personas puedes acumular un máximo de "
-"<strong>200</strong> puntos."
-
-#: templates/faq.html:44
-msgid "After accumulating certain number of points, you can do more:"
-msgstr "Luego de haber acumulado cierta cantidad de puntos, puedes hacer más:"
+#: templates/faq.html:41
+#, fuzzy
+msgid "Rep system summary"
+msgstr "resumen de modificación"
 
-#: templates/faq.html:52 templates/user_votes.html:14
-#: templates/tough/faq.html:50
+#: templates/faq.html:59 templates/user_votes.html:14
 msgid "upvote"
 msgstr "votar positivo"
 
-#: templates/faq.html:56 templates/tough/faq.html:54
+#: templates/faq.html:63
 msgid "use tags"
 msgstr "etiquetas usadas"
 
-#: templates/faq.html:60 templates/tough/faq.html:58
+#: templates/faq.html:68
 msgid "add comments"
 msgstr "agregar comentarios"
 
-#: templates/faq.html:64 templates/user_votes.html:16
-#: templates/tough/faq.html:62
+#: templates/faq.html:72 templates/user_votes.html:16
 msgid "downvote"
 msgstr "votar negativo"
 
-#: templates/faq.html:71 templates/tough/faq.html:69
+#: templates/faq.html:75
+#, fuzzy
+msgid "open and close own questions"
+msgstr "abrir cualquier pregunta cerrada"
+
+#: templates/faq.html:79
 msgid "retag questions"
 msgstr "re-etiquetar preguntas"
 
-#: templates/faq.html:75 templates/tough/faq.html:73
+#: templates/faq.html:83
 msgid "edit community wiki questions"
 msgstr "editar preguntas de la wiki comunitaria"
 
-#: templates/faq.html:79 templates/tough/faq.html:77
+#: templates/faq.html:87
 msgid "edit any answer"
 msgstr "editar cualquier pregunta"
 
-#: templates/faq.html:83 templates/tough/faq.html:81
+#: templates/faq.html:91
 msgid "open any closed question"
 msgstr "abrir cualquier pregunta cerrada"
 
-#: templates/faq.html:87 templates/tough/faq.html:85
+#: templates/faq.html:95
 msgid "delete any comment"
 msgstr "borrar cualquier comentario"
 
-#: templates/faq.html:91 templates/tough/faq.html:89
+#: templates/faq.html:99
 msgid "delete any questions and answers and perform other moderation tasks"
 msgstr ""
 "borrar cualquier pregunta o respuesta y realizar otras tareas de "
 "administración."
 
-#: templates/faq.html:98
+#: templates/faq.html:106
+msgid "how to validate email title"
+msgstr ""
+
+#: templates/faq.html:108
+msgid "how to validate email info"
+msgstr ""
+
+#: templates/faq.html:112
+msgid "what is gravatar"
+msgstr ""
+
+#: templates/faq.html:113
+msgid "gravatar faq info"
+msgstr ""
+
+#: templates/faq.html:116
 msgid "To register, do I need to create new password?"
 msgstr "¿Para registrarme, debo crearme una cuenta?"
 
-#: templates/faq.html:99 templates/tough/faq.html:97
+#: templates/faq.html:117
 msgid ""
 "No, you don't have to. You can login through any service that supports "
 "OpenID, e.g. Google, Yahoo, AOL, etc."
@@ -1196,19 +1170,19 @@ msgstr ""
 "No tienes porqué. Puedes ingresar usando cualquiera de los servicios que "
 "soportan OpenID, ej. Google, Yahoo, AOL, MyOpenID, etc."
 
-#: templates/faq.html:100 templates/tough/faq.html:98
+#: templates/faq.html:118
 msgid "Login now!"
 msgstr "Ingresa ahora!"
 
-#: templates/faq.html:103 templates/tough/faq.html:101
+#: templates/faq.html:123
 msgid "Why other people can edit my questions/answers?"
 msgstr "¿Porqué otras personas pueden editar mis preguntas y respuestas?"
 
-#: templates/faq.html:104 templates/tough/faq.html:102
+#: templates/faq.html:124
 msgid "Goal of this site is..."
 msgstr "El objetivo de este sitio es..."
 
-#: templates/faq.html:104 templates/tough/faq.html:102
+#: templates/faq.html:124
 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 "
@@ -1218,34 +1192,32 @@ msgstr ""
 "usuarios con experiencia, y esto mejora la calidad general del conocimiento "
 "guardado."
 
-#: templates/faq.html:105 templates/tough/faq.html:103
+#: templates/faq.html:125
 msgid "If this approach is not for you, we respect your choice."
 msgstr ""
 "Si esta forma de funcionamiento no es de tu agrado, respetamos tu elección."
 
-#: templates/faq.html:107 templates/tough/faq.html:105
+#: templates/faq.html:129
 msgid "Still have questions?"
 msgstr "¿Aún tienes preguntas?"
 
-#: templates/faq.html:108
+#: templates/faq.html:130
 msgid "Please ask your question, help make our community better!"
 msgstr "Por favor haz tu pregunta, ¡ayudanos a mejorar nuestra comunidad!"
 
-#: templates/faq.html:108 templates/header.html:29 templates/header.html.py:60
-#: templates/tough/faq.html:106
+#: templates/faq.html:132 templates/header.html:29 templates/header.html.py:60
 msgid "questions"
 msgstr "preguntas"
 
-#: templates/faq.html:108 templates/index.html:121
-#: templates/tough/faq.html:106
+#: templates/faq.html:132 templates/index.html:121
 msgid "."
 msgstr ""
 
-#: templates/footer.html:7 templates/header.html:12 templates/index.html:83
+#: templates/footer.html:7 templates/header.html:14 templates/index.html:83
 msgid "about"
 msgstr "acerca de"
 
-#: templates/footer.html:8 templates/header.html:13 templates/index.html:84
+#: templates/footer.html:8 templates/header.html:15 templates/index.html:84
 msgid "faq"
 msgstr "preguntas frecuentes"
 
@@ -1269,11 +1241,11 @@ msgstr "envía comentarios"
 msgid "current revision"
 msgstr "revisión actual"
 
-#: templates/header.html:8
+#: templates/header.html:10
 msgid "logout"
 msgstr "salir"
 
-#: templates/header.html:10 templates/authopenid/signup.html:39
+#: templates/header.html:12 templates/authopenid/signup.html:41
 msgid "login"
 msgstr "entrar"
 
@@ -1289,7 +1261,7 @@ msgstr "usuarios"
 msgid "books"
 msgstr "libros"
 
-#: templates/header.html:34 templates/index.html:121
+#: templates/header.html:34
 msgid "unanswered questions"
 msgstr "sin respuesta"
 
@@ -1305,74 +1277,60 @@ msgstr "hacer una pregunta"
 msgid "search"
 msgstr "buscar"
 
-#: templates/index.html:6
+#: templates/index.html:7
 msgid "Home"
 msgstr "Inicio"
 
-#: templates/index.html:7
-msgid "meta site keywords, comma separated"
-msgstr "palabras claves"
-
-#: templates/index.html:21 templates/questions.html:7
+#: templates/index.html:22 templates/questions.html:7
 msgid "Questions"
 msgstr "Preguntas"
 
-#: templates/index.html:23
+#: templates/index.html:24
 msgid "last updated questions"
 msgstr "ultimas preguntas actualizadas"
 
-#: templates/index.html:23 templates/questions.html:25
-#: templates/unanswered.html:20 templates/tough/unanswered.html:18
+#: templates/index.html:24 templates/questions.html:25
+#: templates/unanswered.html:20
 msgid "newest"
 msgstr "más nuevas"
 
-#: templates/index.html:24 templates/questions.html:27
+#: templates/index.html:25 templates/questions.html:27
 msgid "hottest questions"
 msgstr "preguntas más calientes"
 
-#: templates/index.html:24 templates/questions.html:27
+#: templates/index.html:25 templates/questions.html:27
 msgid "hottest"
 msgstr "más calientes"
 
-#: templates/index.html:25 templates/questions.html:28
+#: templates/index.html:26 templates/questions.html:28
 msgid "most voted questions"
 msgstr "preguntas más votadas"
 
-#: templates/index.html:25 templates/questions.html:28
+#: templates/index.html:26 templates/questions.html:28
 msgid "most voted"
 msgstr "más votadas"
 
-#: templates/index.html:26
+#: templates/index.html:27
 msgid "all questions"
 msgstr "todas las preguntas"
 
-#: templates/index.html:46 templates/questions.html:45
+#: templates/index.html:47 templates/questions.html:45
 #: templates/unanswered.html:36 templates/users_questions.html:35
-#: templates/tough/unanswered.html:34
 msgid "answers"
 msgstr "respuestas"
 
-#: templates/index.html:68 templates/question.html:112
-#: templates/question.html.py:479 templates/questions.html:84
-#: templates/questions.html.py:149 templates/tags.html:47
+#: templates/index.html:69 templates/question.html:115
+#: templates/question.html.py:486 templates/questions.html:84
+#: templates/questions.html.py:156 templates/tags.html:47
 #: templates/unanswered.html:75 templates/unanswered.html.py:109
-#: templates/users_questions.html:52 templates/tough/unanswered.html:72
-#: templates/tough/unanswered.html:105
+#: templates/users_questions.html:52
 msgid "see questions tagged"
 msgstr "ver preguntas etiquetadas"
 
-#: templates/index.html:79
+#: templates/index.html:80
 msgid "welcome to website"
 msgstr "bienvenido a sitio"
 
-#: templates/index.html:81
-msgid "what is this website"
-msgstr "que es este sitio"
-
-#: templates/index.html:82
-msgid "what can one do on this website"
-msgstr "que puede uno hacer en este sitio"
-
 #: templates/index.html:89
 msgid "Recent tags"
 msgstr "Etiquetas recientes"
@@ -1407,7 +1365,8 @@ msgid "Still looking for more? See"
 msgstr "¿Aún sigues buscando más? Ver"
 
 #: templates/index.html:121
-msgid "complete list of quesionts"
+#, fuzzy
+msgid "complete list of questions"
 msgstr "lista completa de preguntas"
 
 #: templates/index.html:121
@@ -1418,6 +1377,11 @@ msgstr "ó"
 msgid "Please help us answer"
 msgstr "Ayudanos a responder"
 
+#: templates/index.html:121
+#, fuzzy
+msgid "list of unanswered questions"
+msgstr "sin respuesta"
+
 #: templates/logout.html:6 templates/logout.html.py:17
 msgid "Logout"
 msgstr "Salir"
@@ -1442,19 +1406,19 @@ msgstr "entradas por página"
 msgid "previous"
 msgstr "previo"
 
-#: templates/paginator.html:20
+#: templates/paginator.html:19
 msgid "current page"
 msgstr "página actúal"
 
-#: templates/paginator.html:23 templates/paginator.html.py:30
+#: templates/paginator.html:22 templates/paginator.html.py:29
 msgid "page number "
 msgstr "número de página"
 
-#: templates/paginator.html:23 templates/paginator.html.py:30
+#: templates/paginator.html:22 templates/paginator.html.py:29
 msgid "number - make blank in english"
 msgstr " "
 
-#: templates/paginator.html:34
+#: templates/paginator.html:33
 msgid "next page"
 msgstr "próxima página"
 
@@ -1502,75 +1466,75 @@ msgstr "Cambios de Códigos"
 msgid "how privacy policies can be changed"
 msgstr "como pueden ser cambiados los códigos de privacidad"
 
-#: templates/question.html:66 templates/question.html.py:78
+#: templates/question.html:69 templates/question.html.py:81
 msgid "i like this post (click again to cancel)"
 msgstr "Me gusta esta entrada (clickear devuelta para cancelar)"
 
-#: templates/question.html:68 templates/question.html.py:80
-#: templates/question.html:273
+#: templates/question.html:71 templates/question.html.py:83
+#: templates/question.html:276
 msgid "current number of votes"
 msgstr "número actual de votos"
 
-#: templates/question.html:73 templates/question.html.py:84
+#: templates/question.html:76 templates/question.html.py:87
 msgid "i dont like this post (click again to cancel)"
 msgstr "No me gusta esta entrada (clickear devuelta para cancelar)"
 
-#: templates/question.html:90
+#: templates/question.html:93
 msgid "mark this question as favorite (click again to cancel)"
 msgstr "marcar esta pregunta como favorita (clickear devuelta para cancelar)"
 
-#: templates/question.html:96
+#: templates/question.html:99
 msgid "remove favorite mark from this question (click again to restore mark)"
 msgstr ""
 "remover marca de favorito a esta pregunta (clickear devuelta para volver a "
 "marcar)"
 
-#: templates/question.html:121 templates/question.html.py:304
+#: templates/question.html:124 templates/question.html.py:307
 #: templates/revisions_answer.html:53 templates/revisions_question.html:53
 msgid "edit"
 msgstr "editar"
 
-#: templates/question.html:125 templates/question.html.py:314
+#: templates/question.html:128 templates/question.html.py:317
 msgid "delete"
 msgstr "borrar"
 
-#: templates/question.html:130
+#: templates/question.html:133
 msgid "reopen"
 msgstr "re-abrir"
 
-#: templates/question.html:135
+#: templates/question.html:138
 msgid "close"
 msgstr "cerrar"
 
-#: templates/question.html:141 templates/question.html.py:327
+#: templates/question.html:144 templates/question.html.py:330
 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:142 templates/question.html.py:328
+#: templates/question.html:145 templates/question.html.py:331
 msgid "flag offensive"
 msgstr "marcar como ofensivo"
 
-#: templates/question.html:154 templates/question.html.py:337
+#: templates/question.html:157 templates/question.html.py:340
 #: templates/revisions_answer.html:65 templates/revisions_question.html:65
 msgid "updated"
 msgstr "actualizado"
 
-#: templates/question.html:203 templates/question.html.py:384
+#: templates/question.html:206 templates/question.html.py:387
 #: templates/revisions_answer.html:63 templates/revisions_question.html:63
 msgid "asked"
 msgstr "preguntado"
 
-#: templates/question.html:233 templates/question.html.py:411
+#: templates/question.html:236 templates/question.html.py:414
 msgid "comments"
 msgstr "comentarios"
 
-#: templates/question.html:234 templates/question.html.py:412
+#: templates/question.html:237 templates/question.html.py:415
 msgid "add comment"
 msgstr "agregar comentario"
 
-#: templates/question.html:247
+#: templates/question.html:250
 #, python-format
 msgid ""
 "The question has been closed for the following reason \"%(question."
@@ -1579,105 +1543,113 @@ msgstr ""
 "La pregunta ha sido cerrada por el siguiente motivo \"%(question."
 "get_close_reason_display)s\" por"
 
-#: templates/question.html:249
+#: templates/question.html:252
 #, python-format
 msgid "close date %(question.closed_at)s"
 msgstr "fecha de cerrada %(question.closed_at)s"
 
-#: templates/question.html:256 templates/user_stats.html:28
+#: templates/question.html:259 templates/user_stats.html:28
 msgid "Answers"
 msgstr "Respuestas"
 
-#: templates/question.html:258
+#: templates/question.html:261
 msgid "oldest answers will be shown first"
 msgstr "la respuesta mas vieja será mostrada primero"
 
-#: templates/question.html:258
+#: templates/question.html:261
 msgid "oldest answers"
 msgstr "pregunta más vieja"
 
-#: templates/question.html:259
+#: templates/question.html:262
 msgid "newest answers will be shown first"
 msgstr "preguntas más nuevas serán mostradas primero"
 
-#: templates/question.html:259
+#: templates/question.html:262
 msgid "newest answers"
 msgstr "más nuevas"
 
-#: templates/question.html:260
+#: templates/question.html:263
 msgid "most voted answers will be shown first"
 msgstr "las preguntas más votadas serán mostradas primero"
 
-#: templates/question.html:260
+#: templates/question.html:263
 msgid "popular answers"
 msgstr "respuestas populares serán mostradas primero"
 
-#: templates/question.html:272
+#: templates/question.html:275
 msgid "i like this answer (click again to cancel)"
 msgstr "me gusta esta respuesta (clickear devuelta para cancelar)"
 
-#: templates/question.html:278
+#: templates/question.html:281
 msgid "i dont like this answer (click again to cancel)"
 msgstr "no me gusta esta respuesta (clickear devuelta para cancelar)"
 
-#: templates/question.html:284
+#: templates/question.html:287
 msgid "mark this answer as favorite (click again to undo)"
 msgstr "marcar esta respuesta como favorita (clickear devuelta para deshacer)"
 
-#: templates/question.html:289
+#: templates/question.html:292
 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:311
+#: templates/question.html:314
 msgid "undelete"
 msgstr "deshacer eliminar"
 
-#: templates/question.html:321
+#: templates/question.html:324
 msgid "answer permanent link"
 msgstr "enlace permanente a respuesta"
 
-#: templates/question.html:322
+#: templates/question.html:325
 msgid "permanent link"
 msgstr "enlace permanente"
 
-#: templates/question.html:436
+#: templates/question.html:438
 msgid "Your answer"
 msgstr "Tu respuesta"
 
-#: templates/question.html:460
+#: templates/question.html:441
+msgid "you can answer anonymously and then login"
+msgstr ""
+
+#: templates/question.html:465
 msgid "Answer the question"
 msgstr "Responde la pregunta"
 
-#: templates/question.html:462
-msgid "Login to answer"
-msgstr "Ingresa para responder"
+#: templates/question.html:467
+msgid "Notify me daily if there are any new answers."
+msgstr ""
+
+#: templates/question.html:469
+msgid "once you sign in you will be able to subscribe for any updates here"
+msgstr ""
 
-#: templates/question.html:474
+#: templates/question.html:481
 msgid "Question tags"
 msgstr "Etiquetas de la pregunta"
 
-#: templates/question.html:484
+#: templates/question.html:491
 msgid "question asked"
 msgstr "pregunta preguntada"
 
-#: templates/question.html:484 templates/question.html.py:490
+#: templates/question.html:491 templates/question.html.py:497
 #: templates/user_info.html:51
 msgid "ago"
 msgstr "atrás"
 
-#: templates/question.html:487
+#: templates/question.html:494
 msgid "question was seen"
 msgstr "la pregunta fue vista"
 
-#: templates/question.html:487
+#: templates/question.html:494
 msgid "times"
 msgstr "veces"
 
-#: templates/question.html:490
+#: templates/question.html:497
 msgid "last updated"
 msgstr "última vez actualizada"
 
-#: templates/question.html:495
+#: templates/question.html:502
 msgid "Related questions"
 msgstr "Preguntas relacionadas"
 
@@ -1697,6 +1669,27 @@ msgstr "por favor hacer preguntas relevantes"
 msgid "please try provide enough details"
 msgstr "intente proveer suficientes detalles"
 
+#: templates/question_retag.html:3 templates/question_retag.html.py:52
+msgid "Change tags"
+msgstr "Cambiar etiquetas"
+
+#: templates/question_retag.html:39
+msgid "up to 5 tags, less than 20 characters each"
+msgstr "hasta 5 etiquetas, menos de 20 caracteres cada una"
+
+#: templates/question_retag.html:86
+msgid "Why use and modify tags?"
+msgstr "¿Porqué usar y modificar etiquetas?"
+
+#: templates/question_retag.html:89
+msgid "tags help us keep Questions organized"
+msgstr ""
+
+#: templates/question_retag.html:95
+msgid "tag editors receive special awards from the community"
+msgstr ""
+"los editores de etiquetas reciben distinciones especiales de la comunidad"
+
 #: templates/questions.html:23
 msgid "Found by tags"
 msgstr "Encontradas por etiqueta"
@@ -1710,7 +1703,6 @@ msgid "All questions"
 msgstr "Todas las preguntas"
 
 #: templates/questions.html:25 templates/unanswered.html:20
-#: templates/tough/unanswered.html:18
 msgid "most recently asked questions"
 msgstr "preguntas hechas más recientemente"
 
@@ -1726,7 +1718,7 @@ msgstr "actividad"
 #, fuzzy, python-format
 msgid ""
 "\n"
-"\t\t\thave total %(q_num)s question tagged %(tagname)s\n"
+"\t\t\thave total %(q_num)s questions tagged %(tagname)s\n"
 "\t\t\t"
 msgid_plural ""
 "\n"
@@ -1736,15 +1728,15 @@ msgstr[0] "ver preguntas etiquetadas '%(tagname)s'"
 msgstr[1] "ver pregunta etiquetada '%(tagname)s'"
 
 #: templates/questions.html:116
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "\n"
-"\t\t\thave total %(q_num)s question containing %(searchtitle)s\n"
-"\t\t\t"
+"\t\t\t\thave total %(q_num)s questions containing %(searchtitle)s\n"
+"\t\t\t\t"
 msgid_plural ""
 "\n"
-"\t\t\thave total %(q_num)s questions containing %(searchtitle)s\n"
-"\t\t\t"
+"\t\t\t\thave total %(q_num)s questions containing %(searchtitle)s\n"
+"\t\t\t\t"
 msgstr[0] ""
 "\n"
 "\t\t\thay un total de %(q_num)s preguntas que contienen %(searchtitle)s\n"
@@ -1754,37 +1746,49 @@ msgstr[1] ""
 "\t\t\thay un total de %(q_num)s pregunta que contiene %(searchtitle)s\n"
 "\t\t\t"
 
-#: templates/questions.html:124
+#: templates/questions.html:122
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\t\t\t\thave total %(q_num)s questions\n"
+"\t\t\t\t"
+msgid_plural ""
+"\n"
+"\t\t\t\thave total %(q_num)s questions\n"
+"\t\t\t\t"
+msgstr[0] "ver preguntas etiquetadas '%(tagname)s'"
+msgstr[1] "ver pregunta etiquetada '%(tagname)s'"
+
+#: templates/questions.html:131
 msgid "latest questions info"
 msgstr "<strong>Más recientes</strong> preguntas son mostradas primero."
 
-#: templates/questions.html:128
+#: 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:129
+#: templates/questions.html:136
 msgid "Most recently answered ones are shown first."
 msgstr "Las más recientemente respondidas son mostradas primero."
 
-#: templates/questions.html:133
+#: 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:134
+#: templates/questions.html:141
 msgid "Most answered questions are shown first."
 msgstr "Preguntas más respondidas aparecen primero."
 
-#: templates/questions.html:138
+#: 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:139
+#: templates/questions.html:146
 msgid "Most voted questions are shown first."
 msgstr "Las preguntas más votadas son mostradas primero."
 
-#: templates/questions.html:146 templates/unanswered.html:105
-#: templates/tough/unanswered.html:101
+#: templates/questions.html:153 templates/unanswered.html:105
 msgid "Related tags"
 msgstr "Etiquetas relacionadas"
 
@@ -1854,7 +1858,6 @@ msgid "Nothing found"
 msgstr "Nada encontrado"
 
 #: templates/unanswered.html:7 templates/unanswered.html.py:18
-#: templates/tough/unanswered.html:5 templates/tough/unanswered.html.py:16
 msgid "Unanswered questions"
 msgstr "Preguntas sin respuesta"
 
@@ -1925,14 +1928,41 @@ msgstr "edad"
 msgid "age unit"
 msgstr "unidad de edad"
 
-#: templates/user_info.html:75
+#: templates/user_info.html:76
 msgid "todays unused votes"
 msgstr "votos de hoy no usados"
 
-#: templates/user_info.html:76
+#: templates/user_info.html:77
 msgid "votes left"
 msgstr "votos restantes"
 
+#: templates/user_preferences.html:10
+msgid "Connect with Twitter"
+msgstr ""
+
+#: templates/user_preferences.html:12
+#, fuzzy
+msgid "Twitter account name:"
+msgstr "Esta cuenta esta inactiva."
+
+#: templates/user_preferences.html:14
+#, fuzzy
+msgid "Twitter password:"
+msgstr "Nueva contraseña"
+
+#: templates/user_preferences.html:16
+msgid "Send my Questions to Twitter"
+msgstr ""
+
+#: templates/user_preferences.html:17
+msgid "Send my Answers to Twitter"
+msgstr ""
+
+#: templates/user_preferences.html:18
+#, fuzzy
+msgid "Save"
+msgstr "Guardar la edición"
+
 #: templates/user_stats.html:15
 msgid "User questions"
 msgstr "Preguntas del usuario"
@@ -1989,7 +2019,7 @@ msgstr "historial de reputación"
 msgid "favorites"
 msgstr "favoritos"
 
-#: templates/user_tabs.html:29
+#: templates/user_tabs.html:28
 msgid "settings"
 msgstr "preferencias"
 
@@ -2026,118 +2056,152 @@ msgstr "esta pregunta ha sido seleccionada como favorita"
 msgid "this answer has been accepted to be correct"
 msgstr "esta respuesta ha sido aceptada como correcta"
 
-#: templates/authopenid/changeemail.html:6
-msgid "Account: change email"
-msgstr "Cuenta: cambiar el email"
+#: templates/authopenid/changeemail.html:7
+#: templates/authopenid/changeemail.html:33
+msgid "Change email"
+msgstr "Cambiar dirección email"
 
-#: templates/authopenid/changeemail.html:9
-msgid ""
-"This is where you can change the email address associated with your account. "
-"Please keep this email address up to date so we can send you a password-"
-"reset email if you request one."
-msgstr ""
-"Aquí es donde puedes cambiar el email asociado a tu cuenta de usuario.Por "
-"favor manten esta dirección de correo al día de forma que podamos mandarte "
-"un cambio de contraseña si tu así lo requieres."
-
-#: templates/authopenid/changeemail.html:11
-#: templates/authopenid/changeopenid.html:13
-#: templates/authopenid/changepw.html:18 templates/authopenid/delete.html:14
-#: templates/authopenid/delete.html:24
+#: templates/authopenid/changeemail.html:10
+#, fuzzy, python-format
+msgid "change %(email)s info"
+msgstr "Cambiar email "
+
+#: 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:"
 msgstr "Por favor corrija los errores debajo: "
 
-#: templates/authopenid/changeemail.html:28
-msgid "Email"
-msgstr "Email"
+#: templates/authopenid/changeemail.html:30
+msgid "Your new Email"
+msgstr ""
 
-#: templates/authopenid/changeemail.html:29
-#: templates/authopenid/signin.html:60
+#: templates/authopenid/changeemail.html:31
+#: templates/authopenid/signin.html:138
 msgid "Password"
 msgstr "Contraseña"
 
-#: templates/authopenid/changeemail.html:31
-msgid "Change email"
+#: templates/authopenid/changeemail.html:42
+#, fuzzy
+msgid "Validate email"
 msgstr "Cambiar dirección email"
 
-#: templates/authopenid/changeopenid.html:7
+#: templates/authopenid/changeemail.html:45
+#, python-format
+msgid "validate %(email)s info"
+msgstr ""
+
+#: templates/authopenid/changeemail.html:50
+#, fuzzy
+msgid "Email not changed"
+msgstr "Email modificado."
+
+#: templates/authopenid/changeemail.html:53
+#, python-format
+msgid "old %(email)s kept"
+msgstr ""
+
+#: templates/authopenid/changeemail.html:58
+#, fuzzy
+msgid "Email changed"
+msgstr "Email modificado."
+
+#: templates/authopenid/changeemail.html:61
+#, python-format
+msgid "your current %(email)s can be used for this"
+msgstr ""
+
+#: templates/authopenid/changeemail.html:66
+msgid "Email verified"
+msgstr ""
+
+#: templates/authopenid/changeemail.html:69
+msgid "thanks for verifying email"
+msgstr ""
+
+#: templates/authopenid/changeemail.html:74
+msgid "email key not sent"
+msgstr ""
+
+#: templates/authopenid/changeemail.html:77
+#, python-format
+msgid "email key not sent %(email)s change email here %(change_link)s"
+msgstr ""
+
+#: templates/authopenid/changeopenid.html:8
 msgid "Account: change OpenID URL"
 msgstr "Cuenta: cambiar la URL de OpenID"
 
-#: templates/authopenid/changeopenid.html:11
+#: templates/authopenid/changeopenid.html:12
 msgid ""
 "This is where you can change your OpenID URL. Make sure you remember it!"
 msgstr "Aquí es donde puedes cambiar tu OpenID URL. Asegurate de recordarla!"
 
-#: templates/authopenid/changeopenid.html:28
+#: templates/authopenid/changeopenid.html:29
 msgid "OpenID URL:"
 msgstr "URL de OpenID:"
 
-#: templates/authopenid/changeopenid.html:29
+#: templates/authopenid/changeopenid.html:30
 msgid "Change OpenID"
 msgstr "Cambiar OpenID"
 
-#: templates/authopenid/changepw.html:13
+#: templates/authopenid/changepw.html:14
 msgid "Account: change password"
 msgstr "Cuenta: cambiar contraseña"
 
-#: templates/authopenid/changepw.html:16
+#: templates/authopenid/changepw.html:17
 msgid "This is where you can change your password. Make sure you remember it!"
 msgstr "Aquí es donde puedes cambiar tu contraseña. Asegurate de recordarlo!"
 
-#: templates/authopenid/changepw.html:26
+#: templates/authopenid/changepw.html:27
 msgid "Current password"
 msgstr "Contraseña actual"
 
-#: templates/authopenid/changepw.html:27
+#: templates/authopenid/changepw.html:28
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: templates/authopenid/changepw.html:28
+#: templates/authopenid/changepw.html:29
 msgid "New password again"
 msgstr "Nueva contraseña nuevamente"
 
-#: templates/authopenid/changepw.html:29 templates/authopenid/settings.html:28
+#: templates/authopenid/changepw.html:30 templates/authopenid/settings.html:29
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: templates/authopenid/complete.html:4
+#: templates/authopenid/complete.html:5
 msgid "Connect your OpenID with this site"
 msgstr "Vincular tu OpenID con este sitio"
 
-#: templates/authopenid/complete.html:7
+#: templates/authopenid/complete.html:8
 msgid "Connect your OpenID with your account on this site"
 msgstr "Vincular tu OpenID con tu cuenta en este sitio"
 
-#: templates/authopenid/complete.html:10
-msgid "Your OpenID is accepted. Please complete this to finish registration."
+#: templates/authopenid/complete.html:12
+#, python-format
+msgid "register new %(provider)s account info"
 msgstr ""
-"Tu OpenID es aceptada. Por favor completa lo siguiente para finalizar el "
-"registro."
 
-#: templates/authopenid/complete.html:11
+#: templates/authopenid/complete.html:14
 msgid "This account already exists, please use another."
 msgstr "Esta cuenta ya existe, por favor usar otra."
 
-#: templates/authopenid/complete.html:16 templates/authopenid/complete.html:29
-#: templates/authopenid/signin.html:43
+#: templates/authopenid/complete.html:19 templates/authopenid/complete.html:32
+#: templates/authopenid/signin.html:121
 msgid "Sorry, looks like we have some errors:"
 msgstr "Ups, parece que hay errores:"
 
-#: templates/authopenid/complete.html:45
-msgid "New account"
-msgstr "Nueva cuenta"
-
-#: templates/authopenid/complete.html:46
-msgid "User name (<i>will be shown to others, cannot be modified</i>)"
-msgstr ""
-"Nombre de usuario (<i>será mostrado a otros, no puede ser modificado</i>)"
-
 #: templates/authopenid/complete.html:47
-msgid "Email (<i>not shared with anyone</i>)"
-msgstr "Email (<i>no será compartido con nadie</i>)"
+msgid "Screen name label"
+msgstr ""
 
 #: templates/authopenid/complete.html:48
+#, fuzzy
+msgid "Email address label"
+msgstr "su email (correo electrónico)"
+
+#: templates/authopenid/complete.html:49
 msgid "create account"
 msgstr "crear cuenta"
 
@@ -2157,15 +2221,46 @@ msgstr "contraseña"
 msgid "Register"
 msgstr "Registrarse"
 
-#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:62
+#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:140
 msgid "Forgot your password?"
 msgstr "¿Olvidaste tu contraseña?"
 
-#: templates/authopenid/delete.html:8
+#: 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
+#, fuzzy
+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"
 
-#: templates/authopenid/delete.html:12
+#: templates/authopenid/delete.html:13
 msgid ""
 "Note: After deleting your account, anyone will be able to register this "
 "username."
@@ -2173,39 +2268,54 @@ msgstr ""
 "Nota: Luego de borrar tu cuenta, cualquiera podrá registrarse con este "
 "nombre de usuario."
 
-#: templates/authopenid/delete.html:16
+#: templates/authopenid/delete.html:17
 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:19
-msgid "Password:"
-msgstr "Contraseña"
-
-#: templates/authopenid/delete.html:31
+#: templates/authopenid/delete.html:32
 msgid "I am sure I want to delete my account."
 msgstr "Estoy seguro que quiero borrar mi cuenta."
 
-#: templates/authopenid/delete.html:32
+#: templates/authopenid/delete.html:33
 msgid "Password/OpenID URL"
 msgstr "Contraseña/OpenID URL"
 
-#: templates/authopenid/delete.html:32
+#: templates/authopenid/delete.html:33
 msgid "(required for your security)"
 msgstr "(requerido por tu seguridad)"
 
-#: templates/authopenid/delete.html:34
+#: templates/authopenid/delete.html:35
 msgid "Delete account permanently"
 msgstr "Borrar la cuenta de forma permanente"
 
-#: templates/authopenid/sendpw.html:3 templates/authopenid/sendpw.html.py:7
+#: 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"
 
-#: templates/authopenid/sendpw.html:11
+#: templates/authopenid/sendpw.html:12
 msgid "Lost your password? No problem - here you can reset it."
 msgstr "¿Haz perdido tu contraseña? No hay problema - aquí puedes re-crearla."
 
-#: templates/authopenid/sendpw.html:12
+#: templates/authopenid/sendpw.html:13
 msgid ""
 "Please enter your username below and new password will be sent to your "
 "registered e-mail"
@@ -2213,15 +2323,19 @@ msgstr ""
 "Por favor, ingresa tu nombre de usuario y una nueva contraseña será enviada "
 "a la dirección de email registrada."
 
-#: templates/authopenid/sendpw.html:29
+#: templates/authopenid/sendpw.html:28
+msgid "User name"
+msgstr "Nombre de usuario"
+
+#: templates/authopenid/sendpw.html:30
 msgid "Reset password"
 msgstr "Re-crear contraseña"
 
-#: templates/authopenid/sendpw.html:29
+#: templates/authopenid/sendpw.html:30
 msgid "return to login"
 msgstr "volver a 'Ingresar'"
 
-#: templates/authopenid/sendpw.html:32
+#: templates/authopenid/sendpw.html:33
 msgid ""
 "Note: your new password will be activated only after you click the "
 "activation link in the email message"
@@ -2229,104 +2343,146 @@ 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/settings.html:29
+#: 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."
 
-#: templates/authopenid/settings.html:30
+#: templates/authopenid/settings.html:31
 msgid "Change email "
 msgstr "Cambiar email "
 
-#: templates/authopenid/settings.html:31
+#: templates/authopenid/settings.html:32
 msgid "Add or update the email address associated with your account."
 msgstr "Agrega o actualiza el email asociado a tu cuenta."
 
-#: templates/authopenid/settings.html:34
+#: templates/authopenid/settings.html:35
 msgid "Change openid associated to your account"
 msgstr "Cambia el OpenID asociado a tu cuenta"
 
-#: templates/authopenid/settings.html:37
+#: templates/authopenid/settings.html:38
 msgid "Delete account"
 msgstr "Eliminar cuenta"
 
-#: templates/authopenid/settings.html:38
+#: templates/authopenid/settings.html:39
 msgid "Erase your username and all your data from website"
 msgstr "Eliminar tu nombre de usuario y toda tu información del sitio"
 
-#: templates/authopenid/signin.html:3 templates/authopenid/signin.html:16
+#: templates/authopenid/signin.html:4 templates/authopenid/signin.html:21
 msgid "User login"
 msgstr "Ingreso de usuario"
 
-#: templates/authopenid/signin.html:21
-msgid "we support two login modes"
+#: templates/authopenid/signin.html:28
+#, python-format
+msgid ""
+"\n"
+"                Your answer to %(title)s %(summary)s will be posted once you "
+"log in\n"
+"                "
 msgstr ""
-"Puedes ingresar por cualquiera de los siguientes servicios, o "
-"tradicionalmente- usando nombre de usuario y contraseña locales"
 
-#: templates/authopenid/signin.html:26 templates/authopenid/signup.html:49
-msgid "Login with your OpenID"
-msgstr "Ingresar con tu OpenID"
+#: templates/authopenid/signin.html:35
+#, python-format
+msgid ""
+"Your question \n"
+"                %(title)s %(summary)s will be posted once you log in\n"
+"                "
+msgstr ""
 
-#: templates/authopenid/signin.html:28
-msgid "select openid provider"
-msgstr "1) Selecciona tu proveedor de OpenID"
+#: templates/authopenid/signin.html:40
+msgid "Click to sign in through any of these services."
+msgstr ""
 
-#: templates/authopenid/signin.html:32
-msgid "verify openid link and login"
+#: templates/authopenid/signin.html:103
+msgid "Enter your <span id=\"enter_your_what\">Provider user name</span>"
 msgstr ""
-"2) Varifica la URL de tu OpenID (escribe tu nombre de usuario donde dice "
-"{nombre de usuario} si lo ves) y luego clickea 'ingresar'"
 
-#: templates/authopenid/signin.html:58
+#: templates/authopenid/signin.html:110
+msgid ""
+"Enter your <a class=\"openid_logo\" href=\"http://openid.net\">OpenID</a> "
+"web address"
+msgstr ""
+
+#: templates/authopenid/signin.html:112 templates/authopenid/signin.html:139
+msgid "Login"
+msgstr "Ingresar"
+
+#: templates/authopenid/signin.html:116
+msgid "we support two login modes"
+msgstr ""
+"Puedes ingresar por cualquiera de los siguientes servicios, o "
+"tradicionalmente- usando nombre de usuario y contraseña locales"
+
+#: templates/authopenid/signin.html:136
 msgid "Use login name and password"
 msgstr "Nombre de usuario y contraseña"
 
-#: templates/authopenid/signin.html:59
+#: templates/authopenid/signin.html:137
 msgid "Login name"
 msgstr "Nombre de usuario"
 
-#: templates/authopenid/signin.html:63
-msgid "Create new acccount"
+#: templates/authopenid/signin.html:141
+#, fuzzy
+msgid "Create new account"
 msgstr "Crear cuenta nueva"
 
-#: templates/authopenid/signin.html:72
+#: templates/authopenid/signin.html:150
 msgid "Why use OpenID?"
 msgstr "¿Porqué usar OpenID?"
 
-#: templates/authopenid/signin.html:76
+#: templates/authopenid/signin.html:154
 msgid "with openid it is easier"
 msgstr "Con OpenID no necesitas crear un nuevo nombre de usuario y contraseña."
 
-#: templates/authopenid/signin.html:79
+#: templates/authopenid/signin.html:157
 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:82
+#: templates/authopenid/signin.html:160
 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:85
+#: templates/authopenid/signin.html:163
 msgid "openid is supported open standard"
 msgstr ""
 "OpenID es basado en un standard abierto, apoyado por muchas organizaciones."
 
-#: templates/authopenid/signin.html:89
+#: templates/authopenid/signin.html:167
 msgid "Find out more"
 msgstr "Averigua más"
 
-#: templates/authopenid/signin.html:90
+#: templates/authopenid/signin.html:168
 msgid "Get OpenID"
 msgstr "Adquiere una OpenID"
 
-#: templates/authopenid/signup.html:2 templates/authopenid/signup.html.py:6
+#: templates/authopenid/signup.html:4 templates/authopenid/signup.html.py:8
 msgid "Signup"
 msgstr "Registrate"
 
-#: templates/authopenid/signup.html:10
+#: templates/authopenid/signup.html:12
 msgid ""
 "We support two types of user registration: conventional username/password, "
 "and"
@@ -2334,66 +2490,195 @@ msgstr ""
 "Soportamos dos formas de registro de usuario: convencional usuario/"
 "contraseña, y"
 
-#: templates/authopenid/signup.html:10
+#: templates/authopenid/signup.html:12
 msgid "the OpenID method"
 msgstr "OpenID"
 
-#: templates/authopenid/signup.html:15
+#: templates/authopenid/signup.html:17
 msgid "Sorry, looks like we have some errors"
 msgstr "Ups, parece que hay errores."
 
-#: templates/authopenid/signup.html:33
+#: templates/authopenid/signup.html:35
 msgid "Conventional registration"
 msgstr "Registro clásico"
 
-#: templates/authopenid/signup.html:34
+#: templates/authopenid/signup.html:36
 msgid "choose a user name"
 msgstr "elije un nombre de usuario"
 
-#: templates/authopenid/signup.html:40
+#: templates/authopenid/signup.html:42
 msgid "back to login"
 msgstr "volver al ingreso de usuario"
 
-#: templates/authopenid/signup.html:46
+#: templates/authopenid/signup.html:48
 msgid "Register with your OpenID"
 msgstr "Registrate con tu OpenID"
 
-#: templates/tough/question_retag.html:2
-msgid "Revise tags"
-msgstr "Revisar etiquetas"
+#: templates/authopenid/signup.html:51
+msgid "Login with your OpenID"
+msgstr "Ingresar con tu OpenID"
 
-#: templates/tough/question_retag.html:37
-msgid "tags are requried"
-msgstr "las etiquetas son requeridas"
+#~ msgid "site slogan"
+#~ msgstr " slogan del sitio"
 
-#: templates/tough/question_retag.html:38
-msgid "up to 5 tags, less than 20 characters each"
-msgstr "hasta 5 etiquetas, menos de 20 caracteres cada una"
+#~ msgid "meta site content"
+#~ msgstr "meta descripción"
 
-#: templates/tough/question_retag.html:51
-msgid "Change tags"
-msgstr "Cambiar etiquetas"
+#~ msgid "copyright message"
+#~ msgstr "mensaje de copyright"
 
-#: templates/tough/question_retag.html:74
-msgid "Change now"
-msgstr "Cambiar ahora"
+#~ msgid ""
+#~ "please use space to separate tags (this enables autocomplete feature)"
+#~ msgstr ""
+#~ "por favor utilice espacio para separar las etiquetas (esto habilitael "
+#~ "auto-completado)"
 
-#: templates/tough/question_retag.html:85
-msgid "Why use and modify tags?"
-msgstr "¿Porqué usar y modificar etiquetas?"
+#~ msgid "Use"
+#~ msgstr "Usar"
 
-#: templates/tough/question_retag.html:96
-msgid "tag editors receive special awards from the community"
-msgstr ""
-"los editores de etiquetas reciben distinciones especiales de la comunidad"
+#~ msgid "learn more about OpenID"
+#~ msgstr "aprender mas sobre OpenID"
+
+#~ msgid "Get your own "
+#~ msgstr "Obtiene tu propio "
+
+#~ msgid "Email: (won't be shown to anyone)"
+#~ msgstr "Email: (no será mostrado a nadie)"
+
+#, fuzzy
+#~ msgid "Congratulations! You have new badges: "
+#~ msgstr "felicitaciones, la comunidad te ha otorgado una distinción"
+
+#, fuzzy
+#~ msgid "go to see"
+#~ msgstr "OK para cerrar"
+
+#~ msgid "congratulations, community gave you a badge"
+#~ msgstr "felicitaciones, la comunidad te ha otorgado una distinción"
+
+#~ msgid "see"
+#~ msgstr "ver"
+
+#~ msgid "profile"
+#~ msgstr "perfil"
+
+#~ msgid ""
+#~ "Anyone can ask questions and give answers, points are not necessary for "
+#~ "that."
+#~ msgstr ""
+#~ "Cualquier usuario puede hacer preguntas y dar respuestas, no es necesario "
+#~ "tener reputación para ello."
+
+#~ msgid ""
+#~ "As we've said before, users help running this site. Point system helps "
+#~ "select users who can administer this community."
+#~ msgstr ""
+#~ "Como dijimos antes, los usuarios ayudan a crear este sitio. El sistema de "
+#~ "reputación permite seleccionar usuarios que pueden moderar esta comunidad."
+
+#~ msgid ""
+#~ "Reputation points roughly measure how community trusts you. These points "
+#~ "are given to you directly by other members of the community."
+#~ msgstr ""
+#~ "Los puntos de reputación miden a groso modo que tan respetado eres en la "
+#~ "comunidad. Los puntos son dados a ti directamente por otros miembros de "
+#~ "la comunidad"
+
+#~ msgid ""
+#~ "For example, if you ask an interesting question or give a helpful answer, "
+#~ "your input will be upvoted and you will gain more trust in the community."
+#~ msgstr ""
+#~ "Por ejemplo, si haces una pregunta interesante, o das una respuesta "
+#~ "valiosa, tu entrada va a ser votada positivamente y tu ganarás confianza "
+#~ "en la comunidad."
+
+#~ msgid ""
+#~ "If on the other hand someone gives a misleading answer, the answer will "
+#~ "be voted down and he/she loses some points."
+#~ msgstr ""
+#~ "Si por el contrario, alguien da una respuesta que no corresponde, la "
+#~ "respuesta será votada negativamente y el usuario perderá puntos."
+
+#~ msgid ""
+#~ "Each vote in favor will generate <strong>10</strong> points, each vote "
+#~ "against will subtract <strong>2</strong> points."
+#~ msgstr ""
+#~ "Cada voto a favor generará <strong>10</strong> puntos, cada voto negativo "
+#~ "restará <strong>2</strong> puntos."
 
-#: templates/tough/unanswered.html:95
-msgid "number of <strong>unanswered</strong> questions"
-msgstr "número de respuestas <strong>sin responder</strong>"
+#~ msgid ""
+#~ "Through the votes of other people you can accumulate a maximum of "
+#~ "<strong>200</strong> points."
+#~ msgstr ""
+#~ "A través del voto de otras personas puedes acumular un máximo de "
+#~ "<strong>200</strong> puntos."
+
+#~ msgid "After accumulating certain number of points, you can do more:"
+#~ msgstr ""
+#~ "Luego de haber acumulado cierta cantidad de puntos, puedes hacer más:"
+
+#~ msgid "meta site keywords, comma separated"
+#~ msgstr "palabras claves"
+
+#~ msgid "what is this website"
+#~ msgstr "que es este sitio"
+
+#~ msgid "what can one do on this website"
+#~ msgstr "que puede uno hacer en este sitio"
+
+#~ msgid "Login to answer"
+#~ msgstr "Ingresa para responder"
+
+#~ msgid "Account: change email"
+#~ msgstr "Cuenta: cambiar el email"
+
+#~ msgid ""
+#~ "This is where you can change the email address associated with your "
+#~ "account. Please keep this email address up to date so we can send you a "
+#~ "password-reset email if you request one."
+#~ msgstr ""
+#~ "Aquí es donde puedes cambiar el email asociado a tu cuenta de usuario.Por "
+#~ "favor manten esta dirección de correo al día de forma que podamos "
+#~ "mandarte un cambio de contraseña si tu así lo requieres."
+
+#~ msgid "Email"
+#~ msgstr "Email"
 
-#~ msgid "Community gives you awards for your questions, answers and votes."
+#~ msgid ""
+#~ "Your OpenID is accepted. Please complete this to finish registration."
 #~ msgstr ""
-#~ "La comunidad te da distinciones por tus preguntas, respuestas y votos."
+#~ "Tu OpenID es aceptada. Por favor completa lo siguiente para finalizar el "
+#~ "registro."
+
+#~ msgid "New account"
+#~ msgstr "Nueva cuenta"
+
+#~ msgid "User name (<i>will be shown to others, cannot be modified</i>)"
+#~ msgstr ""
+#~ "Nombre de usuario (<i>será mostrado a otros, no puede ser modificado</i>)"
+
+#~ msgid "Email (<i>not shared with anyone</i>)"
+#~ msgstr "Email (<i>no será compartido con nadie</i>)"
+
+#~ msgid "select openid provider"
+#~ msgstr "1) Selecciona tu proveedor de OpenID"
+
+#~ msgid "verify openid link and login"
+#~ msgstr ""
+#~ "2) Varifica la URL de tu OpenID (escribe tu nombre de usuario donde dice "
+#~ "{nombre de usuario} si lo ves) y luego clickea 'ingresar'"
+
+#~ msgid "Revise tags"
+#~ msgstr "Revisar etiquetas"
+
+#~ msgid "tags are requried"
+#~ msgstr "las etiquetas son requeridas"
+
+#~ msgid "Change now"
+#~ msgstr "Cambiar ahora"
+
+#~ msgid "number of <strong>unanswered</strong> questions"
+#~ msgstr "número de respuestas <strong>sin responder</strong>"
 
 #
 #~ msgid "editing tips"
diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo
deleted file mode 100644
index cfcea03d..00000000
--- a/locale/zh_CN/LC_MESSAGES/django.mo
+++ /dev/null
diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
index a34a35f2..4d8524b6 100644
--- a/locale/zh_CN/LC_MESSAGES/django.po
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -379,7 +379,7 @@ msgstr "多个标签请用空格间隔-最多5个标签。（优先使用自动�
 
 #: forum/forms.py:53
 msgid "tags are required"
-msgstr "标签不能为空。"
+msgstr " 标签不能为空。"
 
 #: forum/forms.py:57
 msgid "please use 5 tags or less"
@@ -692,6 +692,9 @@ msgstr "预览开关"
 msgid "Save edit"
 msgstr "现在修改"
 
+msgid "Save"
+msgstr "保存"
+
 #: templates/answer_edit.html:74 templates/close.html:29
 #: templates/question_edit.html:120 templates/reopen.html:30
 #: templates/user_edit.html:83
@@ -762,18 +765,16 @@ msgid "Community badges"
 msgstr "社区奖牌"
 
 #: templates/badges.html:53
-#, fuzzy
-msgid ""
+msgid "gold badge description"
 "Gold badge is very rare. To obtain it you have to show profound knowledge "
 "and ability in addition to actively participating in the community. Gold "
 "badge is the highest award in this community."
 msgstr ""
-"你不仅要参与社区的提问、回答、投票等活动，而且需要有高深的知识和能力才能获"
+"金牌是十分罕见的。你不仅要参与社区的提问、回答、投票等活动，而且需要有高深的知识和能力才能获"
 "得。"
 
 #: templates/badges.html:61
-#, fuzzy
-msgid ""
+msgid "silver badge description"
 "Obtaining silver badge requires significant patience. If you got one, you've "
 "very significantly contributed to this community"
 msgstr "它是不同寻常的荣誉，只要你付出足够的努力就会得到。"
@@ -782,9 +783,24 @@ msgstr "它是不同寻常的荣誉，只要你付出足够的努力就会得到
 msgid "bronze badge: often given as a special honor"
 msgstr "铜牌:时常授予之特殊荣誉"
 
+msgid "Connect with Twitter"
+msgstr "同步Twitter消息"
+
+msgid "Twitter account name:"
+msgstr "账号:"
+
+msgid "Twitter password:"
+msgstr "密码:"
+
+msgid "Send my Questions to Twitter"
+msgstr "发布我的提问到我的Twitter"
+
+msgid "Send my Answers to Twitter"
+msgstr "发布我的回答到我的Twitter"
+
 #: templates/badges.html:68
 #, fuzzy
-msgid ""
+msgid "bronze badge description"
 "If you are active in this community, you will get this medal - still it is a "
 "special honor."
 msgstr "铜牌会在你活跃于社区时产生，它相对容易获得，但也是一种特殊的荣誉。"
@@ -1660,6 +1676,9 @@ msgstr "用户投的反对票总数"
 msgid "Tags"
 msgstr "个标签"
 
+msgid "Tags help us keep Questions organized"
+msgstr "CNProg用标签来分类系统的信息"
+
 #: templates/user_stats.html:94
 #, fuzzy, python-format
 msgid "see other questions tagged '%(tag)s' "