Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG into evgenyfadeev/master

Conflicts:
	forum/auth.py
	forum/models.py
	forum/views.py

2 files changed, 1117 insertions, 499 deletions

diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index 8c359972..39dba67d 100644
--- a/locale/en/LC_MESSAGES/django.mo
+++ b/locale/en/LC_MESSAGES/django.mo
diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 93cfdfe4..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-07-28 15:57+0000\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"
@@ -20,15 +20,17 @@ msgstr ""
 msgid "account/"
 msgstr ""
 
-#: settings.py:12 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 ""
@@ -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,31 +329,20 @@ msgstr ""
 msgid "retagged"
 msgstr ""
 
-#: forum/feed.py:17
-msgid "site title"
-msgstr ""
-
-#: forum/feed.py:17
+#: forum/feed.py:18
 msgid " - "
 msgstr ""
 
-#: forum/feed.py:17
-msgid "site slogan"
-msgstr ""
-
-#: forum/feed.py:17
+#: forum/feed.py:18
 msgid "latest questions"
 msgstr ""
 
-#: forum/feed.py:20
-msgid "meta site content"
-msgstr ""
-
-#: forum/feed.py:22
-msgid "copyright message"
+#: forum/feed.py:19
+msgid "questions/"
 msgstr ""
 
-#: forum/forms.py:14 templates/question_edit_tips.html:31
+#: forum/forms.py:14 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 "title"
 msgstr ""
@@ -366,197 +367,239 @@ msgstr ""
 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/unanswered.html:48
+#: 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
 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:50
+#: 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:58
+#: forum/models.py:434 templates/badges.html:60
 msgid "silver"
 msgstr ""
 
-#: forum/models.py:318 templates/badges.html:65
+#: forum/models.py:435 templates/badges.html:67
 msgid "bronze"
 msgstr ""
 
-#: forum/user.py:17 templates/user_tabs.html:7
+#: forum/user.py:16 templates/user_tabs.html:7
 msgid "overview"
 msgstr ""
 
-#: forum/user.py:18
+#: forum/user.py:17
 msgid "user profile"
 msgstr ""
 
-#: forum/user.py:19
+#: forum/user.py:18
 msgid "user profile overview"
 msgstr ""
 
-#: forum/user.py:25 templates/user_tabs.html:9
+#: forum/user.py:24 templates/user_tabs.html:9
 msgid "recent activity"
 msgstr ""
 
-#: forum/user.py:26
+#: forum/user.py:25
 msgid "recent user activity"
 msgstr ""
 
-#: forum/user.py:27
+#: forum/user.py:26
 msgid "profile - recent activity"
 msgstr ""
 
-#: forum/user.py:34 templates/user_tabs.html:13
+#: forum/user.py:33 templates/user_tabs.html:13
 msgid "responses"
 msgstr ""
 
-#: forum/user.py:35 templates/user_tabs.html:12
+#: forum/user.py:34 templates/user_tabs.html:12
 msgid "comments and answers to others questions"
 msgstr ""
 
-#: forum/user.py:36
+#: forum/user.py:35
 msgid "profile - responses"
 msgstr ""
 
-#: forum/user.py:43 templates/user_info.html:23 templates/users.html:25
+#: forum/user.py:42 templates/user_info.html:23 templates/users.html:26
 msgid "reputation"
 msgstr ""
 
-#: forum/user.py:44
+#: forum/user.py:43
 msgid "user reputation in the community"
 msgstr ""
 
-#: forum/user.py:45
+#: forum/user.py:44
 msgid "profile - user reputation"
 msgstr ""
 
-#: forum/user.py:51
+#: forum/user.py:50
 msgid "favorite questions"
 msgstr ""
 
-#: forum/user.py:52
+#: forum/user.py:51
 msgid "users favorite questions"
 msgstr ""
 
-#: forum/user.py:53
+#: forum/user.py:52
 msgid "profile - favorite questions"
 msgstr ""
 
-#: forum/user.py:60 templates/user_tabs.html:20
+#: forum/user.py:59 templates/user_tabs.html:20
 msgid "casted votes"
-msgstr ""
+msgstr "votes"
 
-#: forum/user.py:61 templates/user_tabs.html:20
+#: forum/user.py:60 templates/user_tabs.html:20
 msgid "user vote record"
 msgstr ""
 
-#: forum/user.py:62
+#: forum/user.py:61
 msgid "profile - votes"
 msgstr ""
 
-#: forum/user.py:69
+#: forum/user.py:68
 msgid "preferences"
 msgstr ""
 
-#: forum/user.py:70 templates/user_tabs.html:28
+#: forum/user.py:69 templates/user_tabs.html:27
 msgid "user preference settings"
 msgstr ""
 
-#: forum/user.py:71
+#: forum/user.py:70
 msgid "profile - user preferences"
 msgstr ""
 
-#: forum/views.py:1726
+#: 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:1728
+#: forum/views.py:1855
 msgid "allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'"
 msgstr ""
 
-#: forum/views.py:1730
+#: forum/views.py:1857
 #, python-format
 msgid "maximum upload file size is %sK"
 msgstr ""
 
-#: forum/views.py:1732
+#: 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
 msgid "badges"
@@ -612,6 +655,10 @@ msgstr ""
 msgid "see all tags"
 msgstr ""
 
+#: 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 ""
@@ -628,23 +675,28 @@ msgstr ""
 msgid "see tags"
 msgstr ""
 
+#: templates/about.html:6 templates/about.html.py:11
+msgid "About"
+msgstr ""
+
 #: templates/answer_edit.html:4 templates/answer_edit.html.py:47
 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/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/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/question_retag.html:52 templates/revisions_answer.html:36
+#: templates/revisions_question.html:36
 msgid "back"
 msgstr ""
 
@@ -657,59 +709,125 @@ msgstr ""
 msgid "select revision"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
 #: templates/answer_edit.html:73 templates/question_edit.html:119
+#: 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/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 ""
 
-#: templates/ask.html:4 templates/ask.html.py:60
-msgid "Ask a question"
+#: templates/answer_edit_tips.html:4
+msgid "answer tips"
+msgstr "Tips"
+
+#: templates/answer_edit_tips.html:7
+msgid "please make your answer relevant to this community"
 msgstr ""
 
-#: templates/ask.html:106
-msgid "Use"
+#: templates/answer_edit_tips.html:10
+msgid "try to give an answer, rather than engage into a discussion"
 msgstr ""
 
-#: templates/ask.html:106
-msgid "learn more about OpenID"
+#: templates/answer_edit_tips.html:13
+msgid "please try to provide details"
 msgstr ""
 
-#: templates/ask.html:106 templates/authopenid/signin.html:35
-#: templates/authopenid/signin.html:61
-msgid "Login"
+#: templates/answer_edit_tips.html:16 templates/question_edit_tips.html:13
+msgid "be clear and concise"
 msgstr ""
 
-#: templates/ask.html:109
-msgid "Get your own "
+#: templates/answer_edit_tips.html:19 templates/question_edit_tips.html:16
+msgid "see frequently asked questions"
 msgstr ""
 
-#: templates/ask.html:117 templates/authopenid/sendpw.html:27
-msgid "User name"
+#: templates/answer_edit_tips.html:25 templates/question_edit_tips.html:22
+msgid "Markdown tips"
+msgstr "Markdown basics"
+
+#: templates/answer_edit_tips.html:28 templates/question_edit_tips.html:25
+msgid "*italic* or __italic__"
 msgstr ""
 
-#: templates/ask.html:120
-msgid "Email: (won't be shown to anyone)"
+#: templates/answer_edit_tips.html:31 templates/question_edit_tips.html:28
+msgid "**bold** or __bold__"
 msgstr ""
 
-#: templates/ask.html:127
-msgid "Ask your question"
+#: templates/answer_edit_tips.html:34 templates/question_edit_tips.html:31
+msgid "link"
+msgstr ""
+
+#: 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 ""
+
+#: templates/answer_edit_tips.html:38 templates/question_edit_tips.html:36
+msgid "image"
+msgstr ""
+
+#: templates/answer_edit_tips.html:42 templates/question_edit_tips.html:40
+msgid "numbered list:"
+msgstr ""
+
+#: 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:50 templates/question_edit_tips.html:48
+msgid "learn more about Markdown"
 msgstr ""
 
+#: templates/ask.html:4 templates/ask.html.py:60
+msgid "Ask a question"
+msgstr ""
+
+#: 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: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:108
+msgid "(required)"
+msgstr ""
+
+#: templates/ask.html:115
+msgid "Login/signup to post your question"
+msgstr "Login/Signup to Post"
+
+#: templates/ask.html:117
+msgid "Ask your question"
+msgstr "Ask Your Question"
+
 #: templates/badge.html:6 templates/badge.html.py:17
 msgid "Badge"
 msgstr ""
@@ -718,59 +836,57 @@ msgstr ""
 msgid "The users have been awarded with badges:"
 msgstr ""
 
-#: templates/badges.html:5
+#: templates/badges.html:6
 msgid "Badges summary"
 msgstr ""
 
-#: templates/badges.html:16 templates/user_stats.html:113
+#: templates/badges.html:17 templates/user_stats.html:113
 msgid "Badges"
 msgstr ""
 
-#: templates/badges.html:20
-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."
-msgstr ""
-
-#: templates/badges.html:47
-msgid "Community badges"
+#: 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:53
+#: templates/badges.html:22
 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."
+"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:61
-msgid ""
-"Obtaining silver badge requires significant patience. If you got one, you've "
-"very significantly contributed to this community"
-msgstr ""
+#: templates/badges.html:49
+msgid "Community badges"
+msgstr "Badge levels"
 
-#: templates/badges.html:64
-msgid "bronze badge: often given as a special honor"
+#: 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:68
-msgid ""
-"If you are active in this community, you will get this medal - still it is a "
-"special honor."
+#: 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/base.html:61 templates/base_content.html:60
-msgid "congratulations, community gave you a badge"
-msgstr ""
-
-#: templates/base.html:63 templates/base_content.html:62
-msgid "profile"
+#: templates/badges.html:66
+msgid "bronze badge: often given as a special honor"
 msgstr ""
 
-#: templates/base_content.html:61
-msgid "see"
+#: 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/book.html:7
 msgid "reading channel"
@@ -838,7 +954,7 @@ msgstr ""
 msgid "number of times"
 msgstr ""
 
-#: templates/book.html:105 templates/index.html:47
+#: templates/book.html:105 templates/index.html:48 templates/questions.html:46
 #: templates/unanswered.html:37 templates/users_questions.html:30
 msgid "votes"
 msgstr ""
@@ -847,13 +963,14 @@ msgstr ""
 msgid "the answer has been accepted to be correct"
 msgstr ""
 
-#: templates/book.html:115 templates/index.html:48
+#: templates/book.html:115 templates/index.html:49 templates/questions.html:47
 #: templates/unanswered.html:38 templates/users_questions.html:40
 msgid "views"
 msgstr ""
 
-#: templates/book.html:125 templates/index.html:68 templates/question.html:112
-#: templates/question.html.py:479 templates/tags.html:46
+#: 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
 msgid "using tags"
@@ -863,7 +980,7 @@ msgstr ""
 msgid "subscribe to book RSS feed"
 msgstr ""
 
-#: templates/book.html:147 templates/index.html:115
+#: templates/book.html:147 templates/index.html:116
 msgid "subscribe to the questions feed"
 msgstr ""
 
@@ -883,44 +1000,267 @@ msgstr ""
 msgid "OK to close"
 msgstr ""
 
-#: templates/footer.html:5
-msgid "About us"
+#: templates/faq.html:11
+msgid "Frequently Asked Questions "
 msgstr ""
 
-#: templates/footer.html:6 templates/header.html:13 templates/index.html:83
-msgid "faq"
+#: templates/faq.html:16
+msgid "What kinds of questions can I ask here?"
+msgstr ""
+
+#: 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: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:21
+msgid "What questions should I avoid asking?"
+msgstr "What kinds of questions should be avoided?"
+
+#: 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:27
+msgid "What should I avoid in my answers?"
+msgstr ""
+
+#: 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:32
+msgid "Who moderates this community?"
+msgstr ""
+
+#: templates/faq.html:33
+msgid "The short answer is: <strong>you</strong>."
+msgstr ""
+
+#: templates/faq.html:34
+msgid "This website is moderated by the users."
+msgstr ""
+
+#: templates/faq.html:35
+msgid ""
+"The reputation system allows users earn the authorization to perform a "
+"variety of moderation tasks."
 msgstr ""
 
-#: templates/footer.html:8
-msgid "Contact"
+#: templates/faq.html:40
+msgid "How does reputation system work?"
+msgstr ""
+
+#: 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:59 templates/user_votes.html:14
+msgid "upvote"
+msgstr ""
+
+#: templates/faq.html:63
+msgid "use tags"
+msgstr ""
+
+#: templates/faq.html:68
+msgid "add comments"
+msgstr ""
+
+#: templates/faq.html:72 templates/user_votes.html:16
+msgid "downvote"
+msgstr ""
+
+#: templates/faq.html:75
+msgid "open and close own questions"
+msgstr ""
+
+#: templates/faq.html:79
+msgid "retag questions"
+msgstr ""
+
+#: templates/faq.html:83
+msgid "edit community wiki questions"
+msgstr ""
+
+#: templates/faq.html:87
+msgid "edit any answer"
+msgstr ""
+
+#: templates/faq.html:91
+msgid "open any closed question"
+msgstr ""
+
+#: templates/faq.html:95
+msgid "delete any comment"
+msgstr ""
+
+#: templates/faq.html:99
+msgid "delete any questions and answers and perform other moderation tasks"
+msgstr ""
+
+#: 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: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:118
+msgid "Login now!"
+msgstr ""
+
+#: templates/faq.html:123
+msgid "Why other people can edit my questions/answers?"
+msgstr ""
+
+#: 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: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:125
+msgid "If this approach is not for you, we respect your choice."
+msgstr ""
+
+#: templates/faq.html:129
+msgid "Still have questions?"
+msgstr ""
+
+#: 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:132 templates/header.html:29 templates/header.html.py:60
+msgid "questions"
+msgstr ""
+
+#: templates/faq.html:132 templates/index.html:121
+msgid "."
+msgstr ""
+
+#: templates/footer.html:7 templates/header.html:14 templates/index.html:83
+msgid "about"
+msgstr ""
+
+#: templates/footer.html:8 templates/header.html:15 templates/index.html:84
+msgid "faq"
 msgstr ""
 
 #: templates/footer.html:9
-msgid "Privacy"
+msgid "blog"
 msgstr ""
 
 #: templates/footer.html:10
-msgid "Feedback"
+msgid "contact us"
 msgstr ""
 
-#: templates/header.html:8
-msgid "logout"
+#: templates/footer.html:11
+msgid "privacy policy"
 msgstr ""
 
-#: templates/header.html:10 templates/authopenid/signup.html:39
-msgid "login"
+#: templates/footer.html:12
+msgid "give feedback"
 msgstr ""
 
-#: templates/header.html:12 templates/index.html:82
-msgid "about"
+#: templates/footer.html:18
+msgid "current revision"
 msgstr ""
 
-#: templates/header.html:23
-msgid "back to home page"
+#: templates/header.html:10
+msgid "logout"
 msgstr ""
 
-#: templates/header.html:29 templates/header.html.py:60
-msgid "questions"
+#: templates/header.html:12 templates/authopenid/signup.html:41
+msgid "login"
+msgstr ""
+
+#: templates/header.html:23
+msgid "back to home page"
 msgstr ""
 
 #: templates/header.html:31 templates/header.html.py:62
@@ -931,9 +1271,9 @@ msgstr ""
 msgid "books"
 msgstr ""
 
-#: templates/header.html:34 templates/index.html:120
+#: templates/header.html:34
 msgid "unanswered questions"
-msgstr ""
+msgstr "unanswered"
 
 #: templates/header.html:38
 msgid "my profile"
@@ -947,107 +1287,109 @@ msgstr ""
 msgid "search"
 msgstr ""
 
-#: templates/index.html:6
+#: templates/index.html:7
 msgid "Home"
 msgstr ""
 
-#: templates/index.html:21
+#: templates/index.html:22 templates/questions.html:7
 msgid "Questions"
 msgstr ""
 
-#: templates/index.html:23
+#: templates/index.html:24
 msgid "last updated questions"
 msgstr ""
 
-#: templates/index.html:23 templates/unanswered.html:20
+#: templates/index.html:24 templates/questions.html:25
+#: templates/unanswered.html:20
 msgid "newest"
 msgstr ""
 
-#: templates/index.html:24
+#: templates/index.html:25 templates/questions.html:27
 msgid "hottest questions"
 msgstr ""
 
-#: templates/index.html:24
+#: templates/index.html:25 templates/questions.html:27
 msgid "hottest"
 msgstr ""
 
-#: templates/index.html:25
+#: templates/index.html:26 templates/questions.html:28
 msgid "most voted questions"
 msgstr ""
 
-#: templates/index.html:25
+#: templates/index.html:26 templates/questions.html:28
 msgid "most voted"
 msgstr ""
 
-#: templates/index.html:26
+#: templates/index.html:27
 msgid "all questions"
 msgstr ""
 
-#: templates/index.html:46 templates/unanswered.html:36
-#: templates/users_questions.html:35
+#: templates/index.html:47 templates/questions.html:45
+#: templates/unanswered.html:36 templates/users_questions.html:35
 msgid "answers"
 msgstr ""
 
-#: templates/index.html:68 templates/question.html:112
-#: templates/question.html.py:479 templates/tags.html:46
+#: 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
 msgid "see questions tagged"
 msgstr ""
 
-#: templates/index.html:79
+#: templates/index.html:80
 msgid "welcome to website"
-msgstr ""
+msgstr "Welcome to NMR Wiki Q&A"
 
-#: templates/index.html:88
+#: templates/index.html:89
 msgid "Recent tags"
 msgstr ""
 
-#: templates/index.html:93
+#: templates/index.html:94
 #, python-format
 msgid "see questions tagged '%(tagname)s'"
 msgstr ""
 
-#: templates/index.html:96 templates/index.html.py:120
+#: templates/index.html:97 templates/index.html.py:121
 msgid "popular tags"
-msgstr ""
+msgstr "tags"
 
-#: templates/index.html:100
+#: templates/index.html:101
 msgid "Recent awards"
-msgstr ""
+msgstr "Recent badges"
 
-#: templates/index.html:106
+#: templates/index.html:107
 msgid "given to"
 msgstr ""
 
-#: templates/index.html:111
+#: templates/index.html:112
 msgid "all awards"
-msgstr ""
+msgstr "all badges"
 
-#: templates/index.html:115
+#: templates/index.html:116
 msgid "subscribe to last 30 questions by RSS"
 msgstr ""
 
-#: templates/index.html:120
+#: templates/index.html:121
 msgid "Still looking for more? See"
 msgstr ""
 
-#: templates/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:120
+#: templates/index.html:121
 msgid "or"
 msgstr ""
 
-#: templates/index.html:120
-msgid "."
-msgstr ""
-
-#: templates/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
 msgid "Logout"
 msgstr ""
@@ -1057,17 +1399,36 @@ 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
 msgid "Logout now"
+msgstr "Logout Now"
+
+#: templates/pagesize.html:6
+msgid "posts per page"
+msgstr ""
+
+#: templates/paginator.html:6 templates/paginator.html.py:7
+msgid "previous"
 msgstr ""
 
-#: templates/pagesize.html:5
-msgid "Size per page:"
+#: templates/paginator.html:19
+msgid "current page"
 msgstr ""
 
-#: templates/paginator.html:5
-msgid "Previous"
+#: templates/paginator.html:22 templates/paginator.html.py:29
+msgid "page number "
+msgstr ""
+
+#: templates/paginator.html:22 templates/paginator.html.py:29
+msgid "number - make blank in english"
+msgstr ""
+
+#: templates/paginator.html:33
+msgid "next page"
 msgstr ""
 
 #: templates/privacy.html:6 templates/privacy.html.py:11
@@ -1114,178 +1475,187 @@ msgstr ""
 msgid "how privacy policies can be changed"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: templates/question.html:90
+#: templates/question.html:93
 msgid "mark this question as favorite (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:96
+#: 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
 msgid "edit"
 msgstr ""
 
-#: templates/question.html:125 templates/question.html.py:314
+#: templates/question.html:128 templates/question.html.py:317
 msgid "delete"
 msgstr ""
 
-#: templates/question.html:130
+#: templates/question.html:133
 msgid "reopen"
 msgstr ""
 
-#: templates/question.html:135
+#: templates/question.html:138
 msgid "close"
 msgstr ""
 
-#: 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 ""
 
-#: templates/question.html:142 templates/question.html.py:328
+#: 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
 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
 msgid "asked"
 msgstr ""
 
-#: templates/question.html:233 templates/question.html.py:411
+#: templates/question.html:236 templates/question.html.py:414
 msgid "comments"
 msgstr ""
 
-#: templates/question.html:234 templates/question.html.py:412
+#: templates/question.html:237 templates/question.html.py:415
 msgid "add comment"
 msgstr ""
 
-#: templates/question.html:247
+#: 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/question.html:252
 #, python-format
 msgid "close date %(question.closed_at)s"
 msgstr ""
 
-#: templates/question.html:256 templates/questions.html:44
-#: templates/user_stats.html:28
+#: templates/question.html:259 templates/user_stats.html:28
 msgid "Answers"
-msgstr ""
+msgstr " Answers"
 
-#: templates/question.html:258
+#: templates/question.html:261
 msgid "oldest answers will be shown first"
 msgstr ""
 
-#: templates/question.html:258
+#: templates/question.html:261
 msgid "oldest answers"
-msgstr ""
+msgstr "oldest"
 
-#: templates/question.html:259
+#: templates/question.html:262
 msgid "newest answers will be shown first"
 msgstr ""
 
-#: templates/question.html:259
+#: templates/question.html:262
 msgid "newest answers"
-msgstr ""
+msgstr "newest"
 
-#: templates/question.html:260
+#: templates/question.html:263
 msgid "most voted answers will be shown first"
 msgstr ""
 
-#: templates/question.html:260
+#: templates/question.html:263
 msgid "popular answers"
-msgstr ""
+msgstr "most voted"
 
-#: templates/question.html:272
+#: templates/question.html:275
 msgid "i like this answer (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:278
+#: templates/question.html:281
 msgid "i dont like this answer (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:284
+#: templates/question.html:287
 msgid "mark this answer as favorite (click again to undo)"
 msgstr ""
 
-#: templates/question.html:289
+#: 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/question.html:324
 msgid "answer permanent link"
 msgstr ""
 
-#: templates/question.html:322
+#: templates/question.html:325
 msgid "permanent link"
 msgstr ""
 
-#: templates/question.html:436
+#: templates/question.html:438
 msgid "Your answer"
 msgstr ""
 
-#: templates/question.html:460
+#: 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
-msgid "Login to answer"
+#: templates/question.html:467
+msgid "Notify me daily if there are any new answers."
 msgstr ""
 
-#: templates/question.html:474
+#: 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 ""
+msgstr "Tags"
 
-#: templates/question.html:484
+#: templates/question.html:491
 msgid "question asked"
-msgstr ""
+msgstr "Asked"
 
-#: 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 ""
 
-#: templates/question.html:487
+#: templates/question.html:494
 msgid "question was seen"
-msgstr ""
+msgstr "Seen"
 
-#: templates/question.html:487
+#: templates/question.html:494
 msgid "times"
 msgstr ""
 
-#: templates/question.html:490
+#: templates/question.html:497
 msgid "last updated"
-msgstr ""
+msgstr "Last updated"
 
-#: templates/question.html:495
+#: templates/question.html:502
 msgid "Related questions"
 msgstr ""
 
@@ -1295,7 +1665,7 @@ msgstr ""
 
 #: templates/question_edit_tips.html:4
 msgid "question tips"
-msgstr ""
+msgstr "Tips"
 
 #: templates/question_edit_tips.html:7
 msgid "please ask a relevant question"
@@ -1303,119 +1673,140 @@ msgstr ""
 
 #: templates/question_edit_tips.html:10
 msgid "please try provide enough details"
-msgstr ""
-
-#: templates/question_edit_tips.html:13
-msgid "be clear and concise"
-msgstr ""
-
-#: templates/question_edit_tips.html:16
-msgid "see frequently asked questions"
-msgstr ""
+msgstr "provide enough details"
 
-#: templates/question_edit_tips.html:22
-msgid "Markdown tips"
+#: templates/question_retag.html:3 templates/question_retag.html.py:52
+msgid "Change tags"
 msgstr ""
 
-#: templates/question_edit_tips.html:25
-msgid "*italic* or __italic__"
+#: templates/question_retag.html:39
+msgid "up to 5 tags, less than 20 characters each"
 msgstr ""
 
-#: templates/question_edit_tips.html:28
-msgid "**bold** or __bold__"
+#: templates/question_retag.html:86
+msgid "Why use and modify tags?"
 msgstr ""
 
-#: templates/question_edit_tips.html:31
-msgid "link"
+#: templates/question_retag.html:89
+msgid "tags help us keep Questions organized"
 msgstr ""
 
-#: templates/question_edit_tips.html:31 templates/question_edit_tips.html:36
-msgid "text"
+#: templates/question_retag.html:95
+msgid "tag editors receive special awards from the community"
 msgstr ""
 
-#: templates/question_edit_tips.html:36
-msgid "image"
-msgstr ""
+#: templates/questions.html:23
+msgid "Found by tags"
+msgstr "Tagged questions"
 
-#: templates/question_edit_tips.html:40
-msgid "numbered list:"
+#: templates/questions.html:23
+msgid "Found by title"
 msgstr ""
 
-#: templates/question_edit_tips.html:45
-msgid "basic HTML tags are also supported"
-msgstr ""
-
-#: templates/question_edit_tips.html:48
-msgid "learn more about Markdown"
-msgstr ""
-
-#: templates/questions.html:6
-msgid "Question list"
-msgstr ""
-
-#: templates/questions.html:22
-msgid "Tagged questions"
-msgstr ""
-
-#: templates/questions.html:22
-msgid "Query result"
-msgstr ""
-
-#: templates/questions.html:22
+#: templates/questions.html:23
 msgid "All questions"
 msgstr ""
 
-#: templates/questions.html:24
-msgid "New questions"
-msgstr ""
-
-#: templates/questions.html:24
-msgid "Newest"
-msgstr ""
-
-#: templates/questions.html:25
-msgid "Newest updated questions"
-msgstr ""
-
-#: templates/questions.html:25
-msgid "Active"
+#: templates/questions.html:25 templates/unanswered.html:20
+msgid "most recently asked questions"
 msgstr ""
 
 #: templates/questions.html:26
-msgid "Questions with most answers"
+msgid "most recently updated questions"
 msgstr ""
 
 #: templates/questions.html:26
-msgid "Hottest"
+msgid "active"
 msgstr ""
 
-#: templates/questions.html:27
-msgid "Questions with most votes"
-msgstr ""
+#: templates/questions.html:109
+#, python-format
+msgid ""
+"\n"
+"\t\t\thave total %(q_num)s questions tagged %(tagname)s\n"
+"\t\t\t"
+msgid_plural ""
+"\n"
+"\t\t\thave total %(q_num)s questions tagged %(tagname)s\n"
+"\t\t\t"
+msgstr[0] ""
+"\n"
+"<div class=\"questions-count\">%(q_num)s</div><p>question tagged</p><p><span "
+"class=\"tag\">%(tagname)s</span></p>"
+msgstr[1] ""
+"\n"
+"<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\t\thave total %(q_num)s questions containing %(searchtitle)s\n"
+"\t\t\t\t"
+msgid_plural ""
+"\n"
+"\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 "
+"containing <strong><span class=\"darkred\">%(searchtitle)s</span></strong></"
+"p>"
+msgstr[1] ""
+"\n"
+"<div class=\"questions-count\">%(q_num)s</div><p>questions with title "
+"containing <strong><span class=\"darkred\">%(searchtitle)s</span></strong></"
+"p>"
+
+#: 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:27
-msgid "Best"
-msgstr ""
+#: templates/questions.html:131
+msgid "latest questions info"
+msgstr "<strong>Newest</strong> questions are shown first."
 
-#: templates/questions.html:45
-msgid "Votes"
+#: templates/questions.html:135
+msgid "Questions are sorted by the <strong>time of last update</strong>."
 msgstr ""
 
-#: templates/questions.html:46
-msgid "Visits"
-msgstr ""
+#: templates/questions.html:136
+msgid "Most recently answered ones are shown first."
+msgstr "<strong>Most recently answered</strong> questions are shown first."
+
+#: templates/questions.html:140
+msgid "Questions sorted by <strong>number of responses</strong>."
+msgstr "Questions sorted by the <strong>number of answers</strong>."
+
+#: templates/questions.html:141
+msgid "Most answered questions are shown first."
+msgstr " "
 
-#: templates/questions.html:57 templates/questions.html.py:69
-msgid "Community wiki"
+#: templates/questions.html:145
+msgid "Questions are sorted by the <strong>number of votes</strong>."
 msgstr ""
 
-#: templates/questions.html:83
-msgid "Browse questions with tag of "
+#: templates/questions.html:146
+msgid "Most voted questions are shown first."
 msgstr ""
 
-#: templates/questions.html:125 templates/unanswered.html:105
+#: templates/questions.html:153 templates/unanswered.html:105
 msgid "Related tags"
-msgstr ""
+msgstr "Tags"
 
 #: templates/reopen.html:6 templates/reopen.html.py:16
 msgid "Reopen question"
@@ -1450,35 +1841,35 @@ msgstr ""
 msgid "Revision history"
 msgstr ""
 
-#: templates/tags.html:5 templates/tags.html.py:28
+#: templates/tags.html:6 templates/tags.html.py:29
 msgid "Tag list"
 msgstr ""
 
-#: templates/tags.html:30
+#: templates/tags.html:31
 msgid "sorted alphabetically"
 msgstr ""
 
-#: templates/tags.html:30
+#: templates/tags.html:31
 msgid "by name"
 msgstr ""
 
-#: templates/tags.html:31
+#: templates/tags.html:32
 msgid "sorted by frequency of tag use"
 msgstr ""
 
-#: templates/tags.html:31
+#: templates/tags.html:32
 msgid "by popularity"
 msgstr ""
 
-#: templates/tags.html:37
+#: templates/tags.html:38
 msgid "All tags matching query"
 msgstr ""
 
-#: templates/tags.html:37
+#: templates/tags.html:38
 msgid "all tags - make this empty in english"
 msgstr ""
 
-#: templates/tags.html:40
+#: templates/tags.html:41
 msgid "Nothing found"
 msgstr ""
 
@@ -1486,14 +1877,12 @@ msgstr ""
 msgid "Unanswered questions"
 msgstr ""
 
-#: templates/unanswered.html:20
-msgid "most recently asked questions"
-msgstr ""
-
 #: templates/unanswered.html:97
 #, python-format
 msgid "have %(num_q)s unanswered questions"
 msgstr ""
+"<div class=\"questions-count\">%(num_q)s</div><strong>unanswered</strong> "
+"questions"
 
 #: templates/unanswered.html:99
 msgid "Have a total of"
@@ -1513,7 +1902,7 @@ msgstr ""
 
 #: 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
 msgid "Registered user"
@@ -1553,16 +1942,40 @@ msgstr ""
 
 #: templates/user_info.html:70
 msgid "age unit"
-msgstr ""
+msgstr "years old"
 
-#: templates/user_info.html:75
+#: templates/user_info.html:76
 msgid "todays unused votes"
 msgstr ""
 
-#: templates/user_info.html:76
+#: templates/user_info.html:77
 msgid "votes left"
 msgstr ""
 
+#: 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 ""
@@ -1583,7 +1996,7 @@ msgstr ""
 
 #: templates/user_stats.html:56
 msgid "votes total"
-msgstr ""
+msgstr "Votes"
 
 #: templates/user_stats.html:65
 msgid "user has voted up this many times"
@@ -1618,40 +2031,32 @@ msgstr ""
 msgid "favorites"
 msgstr ""
 
-#: templates/user_tabs.html:29
+#: templates/user_tabs.html:28
 msgid "settings"
 msgstr ""
 
-#: templates/user_votes.html:14
-msgid "upvote"
-msgstr ""
-
-#: templates/user_votes.html:16
-msgid "downvote"
-msgstr ""
-
-#: templates/users.html:5 templates/users.html.py:23
+#: templates/users.html:6 templates/users.html.py:24
 msgid "Users"
 msgstr ""
 
-#: templates/users.html:26
+#: templates/users.html:27
 msgid "recent"
 msgstr ""
 
-#: templates/users.html:27
+#: templates/users.html:28
 msgid "oldest"
 msgstr ""
 
-#: templates/users.html:28
+#: templates/users.html:29
 msgid "by username"
 msgstr ""
 
-#: templates/users.html:34
+#: templates/users.html:35
 #, python-format
 msgid "users matching query %(suser)s:"
 msgstr ""
 
-#: templates/users.html:38
+#: templates/users.html:39
 msgid "Nothing found."
 msgstr ""
 
@@ -1663,114 +2068,185 @@ msgstr ""
 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:60
+#: 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/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/changeopenid.html:7
+#: 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: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 ""
 
-#: 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"
@@ -1788,186 +2264,328 @@ msgstr ""
 msgid "Register"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
+"<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"
+#: 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:110
+msgid ""
+"Enter your <a class=\"openid_logo\" href=\"http://openid.net\">OpenID</a> "
+"web address"
+msgstr ""
+"<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:112 templates/authopenid/signin.html:139
+msgid "Login"
 msgstr ""
 
-#: templates/authopenid/signin.html:32
-msgid "verify openid link and login"
+#: 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:58
+#: templates/authopenid/signin.html:136
 msgid "Use login name and password"
 msgstr ""
 
-#: templates/authopenid/signin.html:59
+#: templates/authopenid/signin.html:137
 msgid "Login name"
 msgstr ""
 
-#: templates/authopenid/signin.html:63
-msgid "Create new acccount"
+#: templates/authopenid/signin.html:141
+msgid "Create new account"
 msgstr ""
 
-#: templates/authopenid/signin.html:72
+#: templates/authopenid/signin.html:150
 msgid "Why use OpenID?"
 msgstr ""
 
-#: templates/authopenid/signin.html:76
+#: templates/authopenid/signin.html:154
 msgid "with openid it is easier"
-msgstr ""
+msgstr "With the OpenID you don't need to create new username and password."
 
-#: templates/authopenid/signin.html:79
+#: templates/authopenid/signin.html:157
 msgid "reuse openid"
-msgstr ""
+msgstr "You can safely re-use the same login for all OpenID-enabled websites."
 
-#: templates/authopenid/signin.html:82
+#: 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:85
+#: templates/authopenid/signin.html:163
 msgid "openid is supported open standard"
-msgstr ""
+msgstr "OpenID is based on an open standard, supported by many organizations."
 
-#: templates/authopenid/signin.html:89
+#: templates/authopenid/signin.html:167
 msgid "Find out more"
 msgstr ""
 
-#: templates/authopenid/signin.html:90
+#: 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/authopenid/signup.html:51
+msgid "Login with your OpenID"
+msgstr ""
+
+#~ msgid "what is this website"
+#~ msgstr ""
+#~ "This is a collaboratively edited question and answer site for the "
+#~ "Magnetic Resonance specialists."
+
+#
+#~ msgid "editing tips"
+#~ msgstr "Tips"
+
+#~ msgid "Newest questions shown first."
+#~ msgstr ""
+#~ "Questions are sorted by <strong>entry date</strong>.Newest questions "
+#~ "shown first."
+
+#~ msgid ""
+#~ "please use space to separate tags (this enables autocomplete feature)"
+#~ msgstr "please use space to separate tags (uses autocomplete utility)"
+
+#~ msgid "select openid provider"
+#~ msgstr "1) Please select your id service provider."
+
+#~ msgid "verify openid link and login"
+#~ msgstr ""
+#~ "2) Please verify the OpenID URL (type your login name over {username}, if "
+#~ "present) and then log in."