summaryrefslogtreecommitdiffstats
path: root/locale
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2010-04-01 21:16:53 -0400
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2010-04-01 21:16:53 -0400
commit03c4b21e39c85b70b9e026fa4f9c38775babcc60 (patch)
treef44134affc9b4b1c8e90fbc23ec1c99ae60ad3f8 /locale
parent60b04163c9096a7b24cbe52e1095c47ba04271f8 (diff)
downloadaskbot-03c4b21e39c85b70b9e026fa4f9c38775babcc60.tar.gz
askbot-03c4b21e39c85b70b9e026fa4f9c38775babcc60.tar.bz2
askbot-03c4b21e39c85b70b9e026fa4f9c38775babcc60.zip
fixed some html, karma graph in IE7 and 8 and favorites view, removed executable mode from some files, fixed an error in question faving
Diffstat (limited to 'locale')
-rw-r--r--locale/en/LC_MESSAGES/django.mobin26871 -> 27146 bytes
-rw-r--r--locale/en/LC_MESSAGES/django.po935
2 files changed, 316 insertions, 619 deletions
diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index 4eaf9b83..65af2080 100644
--- a/locale/en/LC_MESSAGES/django.mo
+++ b/locale/en/LC_MESSAGES/django.mo
Binary files differ
diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 3d1e14a3..23e1d410 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: 2010-03-27 11:33-0400\n"
+"POT-Creation-Date: 2010-04-01 21:11-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"
@@ -28,28 +28,27 @@ msgstr ""
msgid "can't have two logins to the same account yet, sorry."
msgstr ""
-#: django_authopenid/forms.py:157 forum_modules/localauth/forms.py:59
+#: django_authopenid/forms.py:157
msgid "Please enter valid username and password (both are case-sensitive)."
msgstr ""
#: django_authopenid/forms.py:160 django_authopenid/forms.py:210
-#: forum_modules/localauth/forms.py:62
msgid "This account is inactive."
msgstr ""
-#: django_authopenid/forms.py:162 forum_modules/localauth/forms.py:64
+#: django_authopenid/forms.py:162
msgid "Login failed."
msgstr ""
-#: django_authopenid/forms.py:164 forum_modules/localauth/forms.py:66
+#: django_authopenid/forms.py:164
msgid "Please enter username and password"
msgstr ""
-#: django_authopenid/forms.py:166 forum_modules/localauth/forms.py:68
+#: django_authopenid/forms.py:166
msgid "Please enter your password"
msgstr ""
-#: django_authopenid/forms.py:168 forum_modules/localauth/forms.py:70
+#: django_authopenid/forms.py:168
msgid "Please enter user name"
msgstr ""
@@ -59,11 +58,11 @@ msgid ""
"both fields are case-sensitive."
msgstr ""
-#: django_authopenid/forms.py:229 forum/authentication/forms.py:60
+#: django_authopenid/forms.py:229
msgid "Current password"
msgstr ""
-#: django_authopenid/forms.py:240 forum/authentication/forms.py:71
+#: django_authopenid/forms.py:240
msgid ""
"Old password is incorrect. Please enter the correct "
"password."
@@ -80,7 +79,6 @@ msgstr "sorry, there is no such user name"
#: django_authopenid/urls.py:23 django_authopenid/urls.py:24
#: django_authopenid/urls.py:25 django_authopenid/urls.py:27
#: fbconnect/urls.py:12 fbconnect/urls.py:13 fbconnect/urls.py:14
-#: forum/urls.py:93 forum/urls.py:95 forum/urls.py:96
msgid "signin/"
msgstr ""
@@ -92,7 +90,7 @@ msgstr ""
msgid "newanswer/"
msgstr ""
-#: django_authopenid/urls.py:26 forum/urls.py:94
+#: django_authopenid/urls.py:26
msgid "signout/"
msgstr ""
@@ -101,7 +99,7 @@ msgid "complete/"
msgstr ""
#: django_authopenid/urls.py:29 fbconnect/urls.py:16 fbconnect/urls.py:17
-#: fbconnect/urls.py:18 forum/urls.py:98 forum_modules/localauth/urls.py:7
+#: fbconnect/urls.py:18
msgid "register/"
msgstr ""
@@ -130,7 +128,7 @@ msgstr ""
msgid "email/"
msgstr ""
-#: django_authopenid/urls.py:38 forum/urls.py:99
+#: django_authopenid/urls.py:38
msgid "validate/"
msgstr ""
@@ -415,58 +413,56 @@ msgstr ""
msgid "latest questions"
msgstr ""
-#: forum/forms.py:22 forum/skins/default/templates/answer_edit_tips.html:35
+#: forum/forms.py:21 forum/skins/default/templates/answer_edit_tips.html:35
#: forum/skins/default/templates/answer_edit_tips.html:39
#: forum/skins/default/templates/question_edit_tips.html:32
#: forum/skins/default/templates/question_edit_tips.html:37
msgid "title"
msgstr ""
-#: forum/forms.py:23
+#: forum/forms.py:22
msgid "please enter a descriptive title for your question"
msgstr ""
-#: forum/forms.py:28
+#: forum/forms.py:27
msgid "title must be > 10 characters"
msgstr ""
-#: forum/forms.py:37
+#: forum/forms.py:36
msgid "content"
msgstr ""
-#: forum/forms.py:43
+#: forum/forms.py:42
msgid "question content must be > 10 characters"
msgstr ""
-#: forum/forms.py:52 forum/skins/default/templates/header.html:28
+#: forum/forms.py:51 forum/skins/default/templates/header.html:28
#: forum/skins/default/templates/header.html:56
msgid "tags"
msgstr ""
-#: forum/forms.py:54
+#: forum/forms.py:53
msgid ""
"Tags are short keywords, with no spaces within. Up to five tags can be used."
msgstr ""
-#: forum/forms.py:61 forum/skins/default/templates/question_retag.html:39
+#: forum/forms.py:60 forum/skins/default/templates/question_retag.html:39
msgid "tags are required"
msgstr ""
-#: forum/forms.py:67
+#: forum/forms.py:66
msgid "please use 5 tags or less"
msgstr ""
-#: forum/forms.py:70
+#: forum/forms.py:69
msgid "tags must be shorter than 20 characters"
msgstr ""
-#: forum/forms.py:74
-msgid ""
-"please use following characters in tags: letters 'a-z', numbers, and "
-"characters '.-_#'"
+#: forum/forms.py:73
+msgid "please use letters, numbers, and characters '.-_#'"
msgstr ""
-#: forum/forms.py:84
+#: forum/forms.py:83
#: forum/skins/default/templates/post_contributor_info.html:7
#: forum/skins/default/templates/question_summary_list_roll.html:26
#: forum/skins/default/templates/question_summary_list_roll.html:38
@@ -475,116 +471,116 @@ msgstr ""
msgid "community wiki"
msgstr ""
-#: forum/forms.py:85
+#: forum/forms.py:84
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:101
+#: forum/forms.py:100
msgid "update summary:"
msgstr ""
-#: forum/forms.py:102
+#: forum/forms.py:101
msgid ""
"enter a brief summary of your revision (e.g. fixed spelling, grammar, "
"improved style, this field is optional)"
msgstr ""
-#: forum/forms.py:105
+#: forum/forms.py:104
msgid "Automatically accept user's contributions for the email updates"
msgstr ""
-#: forum/forms.py:121
+#: forum/forms.py:120
msgid "Your name:"
msgstr ""
-#: forum/forms.py:122
+#: forum/forms.py:121
msgid "Email (not shared with anyone):"
msgstr ""
-#: forum/forms.py:123
+#: forum/forms.py:122
msgid "Your message:"
msgstr ""
-#: forum/forms.py:206
+#: forum/forms.py:205
msgid "this email does not have to be linked to gravatar"
msgstr ""
-#: forum/forms.py:208
+#: forum/forms.py:207
msgid "Screen name"
msgstr ""
-#: forum/forms.py:209
+#: forum/forms.py:208
msgid "Real name"
msgstr ""
-#: forum/forms.py:210
+#: forum/forms.py:209
msgid "Website"
msgstr ""
-#: forum/forms.py:211
+#: forum/forms.py:210
msgid "Location"
msgstr ""
-#: forum/forms.py:212
+#: forum/forms.py:211
msgid "Date of birth"
msgstr ""
-#: forum/forms.py:212
+#: forum/forms.py:211
msgid "will not be shown, used to calculate age, format: YYYY-MM-DD"
msgstr ""
-#: forum/forms.py:213 forum/skins/default/templates/account_settings.html:21
+#: forum/forms.py:212 forum/skins/default/templates/account_settings.html:21
#: forum/skins/default/templates/authopenid/settings.html:21
msgid "Profile"
msgstr ""
-#: forum/forms.py:244 forum/forms.py:245
+#: forum/forms.py:243 forum/forms.py:244
msgid "this email has already been registered, please use another one"
msgstr ""
-#: forum/forms.py:251
+#: forum/forms.py:250
msgid "Choose email tag filter"
msgstr ""
-#: forum/forms.py:267 forum/forms.py:268
+#: forum/forms.py:266 forum/forms.py:267
msgid "weekly"
msgstr ""
-#: forum/forms.py:267 forum/forms.py:268
+#: forum/forms.py:266 forum/forms.py:267
msgid "no email"
msgstr ""
-#: forum/forms.py:268
+#: forum/forms.py:267
msgid "daily"
msgstr ""
-#: forum/forms.py:283
+#: forum/forms.py:282
msgid "Asked by me"
msgstr ""
-#: forum/forms.py:286
+#: forum/forms.py:285
msgid "Answered by me"
msgstr ""
-#: forum/forms.py:289
+#: forum/forms.py:288
msgid "Individually selected"
msgstr ""
-#: forum/forms.py:292
+#: forum/forms.py:291
msgid "Entire forum (tag filtered)"
msgstr ""
-#: forum/forms.py:346 forum/authentication/forms.py:41
+#: forum/forms.py:345
msgid "okay, let's try!"
msgstr ""
-#: forum/forms.py:347 forum/authentication/forms.py:42
+#: forum/forms.py:346
msgid "no community email please, thanks"
msgstr "no askbot email please, thanks"
-#: forum/forms.py:350 forum/authentication/forms.py:45
+#: forum/forms.py:349
msgid "please choose one of the options above"
msgstr ""
@@ -617,7 +613,7 @@ msgid "comments/"
msgstr ""
#: forum/urls.py:38 forum/urls.py:43 forum/urls.py:78
-#: forum/skins/default/templates/user_info.html:45
+#: forum/skins/default/templates/user_info.html:47
msgid "edit/"
msgstr ""
@@ -719,53 +715,10 @@ msgstr ""
msgid "feedback/"
msgstr ""
-#: forum/urls.py:93 forum/urls.py:94 forum/urls.py:95 forum/urls.py:96
-#: forum/urls.py:97 forum/urls.py:98 forum/urls.py:99 forum/urls.py:100
-#: forum/urls.py:101 forum/urls.py:102 forum/urls.py:103 forum/urls.py:104
-#: forum_modules/localauth/urls.py:7
+#: forum/urls.py:89 forum/urls.py:90
msgid "account/"
msgstr ""
-#: forum/urls.py:97
-msgid "done/"
-msgstr ""
-
-#: forum/urls.py:100 forum/urls.py:101
-msgid "tempsignin/"
-msgstr ""
-
-#: forum/urls.py:102
-msgid "authsettings/"
-msgstr ""
-
-#: forum/urls.py:103 forum/urls.py:104
-msgid "providers/"
-msgstr ""
-
-#: forum/urls.py:103
-msgid "remove/"
-msgstr ""
-
-#: forum/urls.py:104
-msgid "add/"
-msgstr ""
-
-#: forum/authentication/forms.py:22
-msgid "Your account email"
-msgstr ""
-
-#: forum/authentication/forms.py:24
-msgid "You cannot leave this field blank"
-msgstr ""
-
-#: forum/authentication/forms.py:25 forum/utils/forms.py:111
-msgid "please enter a valid email address"
-msgstr ""
-
-#: forum/authentication/forms.py:33
-msgid "Sorry, but this email is not on our database."
-msgstr ""
-
#: forum/management/commands/send_email_alerts.py:236
msgid "email update message subject"
msgstr "news from Q&A forum"
@@ -829,27 +782,27 @@ msgstr ""
msgid "First time here? Check out the <a href=\"%s\">FAQ</a>!"
msgstr ""
-#: forum/models/question.py:362
+#: forum/models/question.py:360
#, python-format
msgid "%(author)s modified the question"
msgstr ""
-#: forum/models/question.py:366
+#: forum/models/question.py:364
#, python-format
msgid "%(people)s posted %(new_answer_count)s new answers"
msgstr ""
-#: forum/models/question.py:371
+#: forum/models/question.py:369
#, python-format
msgid "%(people)s commented the question"
msgstr ""
-#: forum/models/question.py:376
+#: forum/models/question.py:374
#, python-format
msgid "%(people)s commented answers"
msgstr ""
-#: forum/models/question.py:378
+#: forum/models/question.py:376
#, python-format
msgid "%(people)s commented an answer"
msgstr ""
@@ -976,7 +929,6 @@ msgid "Account functions"
msgstr ""
#: forum/skins/default/templates/account_settings.html:29
-#: forum/skins/default/templates/auth/auth_settings.html:31
#: forum/skins/default/templates/authopenid/changepw.html:5
#: forum/skins/default/templates/authopenid/changepw.html:14
#: forum/skins/default/templates/authopenid/settings.html:29
@@ -1090,7 +1042,7 @@ msgstr ""
#: forum/skins/default/templates/question_edit.html:119
#: forum/skins/default/templates/question_retag.html:75
#: forum/skins/default/templates/reopen.html:30
-#: forum/skins/default/templates/user_edit.html:87
+#: forum/skins/default/templates/user_edit.html:84
#: forum/skins/default/templates/authopenid/changeemail.html:40
msgid "Cancel"
msgstr ""
@@ -1345,7 +1297,7 @@ msgstr ""
#: forum/skins/default/templates/question_list.html:14
#: forum/skins/default/templates/question_summary_list_roll.html:14
#: forum/skins/default/templates/questions.html:80
-#: forum/skins/default/templates/users_questions.html:32
+#: forum/skins/default/templates/users_questions.html:31
msgid "votes"
msgstr ""
@@ -1358,7 +1310,7 @@ msgstr ""
#: forum/skins/default/templates/question_list.html:22
#: forum/skins/default/templates/question_summary_list_roll.html:15
#: forum/skins/default/templates/questions.html:81
-#: forum/skins/default/templates/users_questions.html:40
+#: forum/skins/default/templates/users_questions.html:39
msgid "views"
msgstr ""
@@ -1369,7 +1321,7 @@ msgstr ""
#: forum/skins/default/templates/question_summary_list_roll.html:52
#: forum/skins/default/templates/questions.html:136
#: forum/skins/default/templates/tags.html:49
-#: forum/skins/default/templates/users_questions.html:52
+#: forum/skins/default/templates/users_questions.html:50
msgid "using tags"
msgstr ""
@@ -1564,18 +1516,24 @@ msgstr ""
#: forum/skins/default/templates/faq.html:110
msgid "what is gravatar"
-msgstr "What is gravatar?"
+msgstr "How to change my picture (gravatar) and what is gravatar?"
#: forum/skins/default/templates/faq.html:111
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>"
+"<p>The picture that appears on the users profiles is called "
+"<strong>gravatar</strong> (which means <strong>g</strong>lobally <strong>r</"
+"strong>ecognized <strong>avatar</strong>).</p><p>Here is how it works: a "
+"<strong>cryptographic key</strong> (unbreakable code) is calculated from "
+"your email address. You upload your picture (or your favorite alter ego "
+"image) the website <a href='http://gravatar.com'><strong>gravatar.com</"
+"strong></a> from where we later retreive your image using the key.</"
+"p><p>This way all the websites you trust can show your image next to your "
+"posts and your email address remains private.</p><p>Please "
+"<strong>personalize your account</strong> with an image - just register at "
+"<a href='http://gravatar.com'><strong>gravatar.com</strong></a> (just please "
+"be sure to use the same email address that you used to register with us). "
+"Default image that looks like a kitchen tile is generated automatically.</p>"
#: forum/skins/default/templates/faq.html:114
msgid "To register, do I need to create new password?"
@@ -1739,7 +1697,7 @@ msgid "books"
msgstr ""
#: forum/skins/default/templates/header.html:33
-#: forum/templatetags/extra_tags.py:166 forum/templatetags/extra_tags.py:195
+#: forum/templatetags/extra_tags.py:176 forum/templatetags/extra_tags.py:205
msgid "badges"
msgstr ""
@@ -1857,7 +1815,6 @@ msgstr "list of all questions"
#: forum/skins/default/templates/index.html:92
#: forum/skins/default/templates/index_.html:121
-#: forum/skins/default/templates/auth/signup.html:28
#: forum/skins/default/templates/authopenid/signup.html:28
msgid "or"
msgstr ""
@@ -1874,7 +1831,7 @@ msgstr "unanswered questions"
#: forum/skins/default/templates/index_.html:42
#: forum/skins/default/templates/question_list.html:16
-#: forum/skins/default/templates/users_questions.html:34
+#: forum/skins/default/templates/users_questions.html:33
msgid "this answer has been accepted to be correct"
msgstr ""
@@ -1882,7 +1839,7 @@ msgstr ""
#: forum/skins/default/templates/question_list.html:18
#: forum/skins/default/templates/question_summary_list_roll.html:13
#: forum/skins/default/templates/questions.html:79
-#: forum/skins/default/templates/users_questions.html:36
+#: forum/skins/default/templates/users_questions.html:35
msgid "answers"
msgstr ""
@@ -1892,7 +1849,7 @@ msgstr ""
#: forum/skins/default/templates/question_summary_list_roll.html:52
#: forum/skins/default/templates/questions.html:136
#: forum/skins/default/templates/tags.html:49
-#: forum/skins/default/templates/users_questions.html:52
+#: forum/skins/default/templates/users_questions.html:50
msgid "see questions tagged"
msgstr ""
@@ -2644,25 +2601,16 @@ msgstr ""
msgid "edit profile"
msgstr ""
-#: forum/skins/default/templates/user_edit.html:31
-msgid "image associated with your email address"
-msgstr ""
-
-#: forum/skins/default/templates/user_edit.html:31
-#, python-format
-msgid "avatar, see %(gravatar_faq_url)s"
-msgstr "<a href='%(gravatar_faq_url)s'>gravatar</a>"
-
-#: forum/skins/default/templates/user_edit.html:36
-#: forum/skins/default/templates/user_info.html:56
+#: forum/skins/default/templates/user_edit.html:33
+#: forum/skins/default/templates/user_info.html:53
msgid "Registered user"
msgstr ""
-#: forum/skins/default/templates/user_edit.html:43
+#: forum/skins/default/templates/user_edit.html:40
msgid "Screen Name"
msgstr ""
-#: forum/skins/default/templates/user_edit.html:86
+#: forum/skins/default/templates/user_edit.html:83
#: forum/skins/default/templates/user_email_subscriptions.html:20
msgid "Update"
msgstr ""
@@ -2684,55 +2632,63 @@ msgstr ""
msgid "Stop sending email"
msgstr "Stop Email"
-#: forum/skins/default/templates/user_info.html:22
-#: forum/skins/default/templates/users.html:26 forum/views/users.py:916
+#: forum/skins/default/templates/user_info.html:18
+msgid "change picture"
+msgstr ""
+
+#: forum/skins/default/templates/user_info.html:25
+#: forum/skins/default/templates/users.html:26 forum/views/users.py:920
msgid "reputation"
msgstr "karma"
-#: forum/skins/default/templates/user_info.html:32
+#: forum/skins/default/templates/user_info.html:35
msgid "Moderate this user"
msgstr ""
-#: forum/skins/default/templates/user_info.html:45
+#: forum/skins/default/templates/user_info.html:47
msgid "update profile"
msgstr ""
-#: forum/skins/default/templates/user_info.html:60
+#: forum/skins/default/templates/user_info.html:57
msgid "real name"
msgstr ""
-#: forum/skins/default/templates/user_info.html:65
+#: forum/skins/default/templates/user_info.html:62
msgid "member for"
msgstr "member since"
-#: forum/skins/default/templates/user_info.html:70
+#: forum/skins/default/templates/user_info.html:67
msgid "last seen"
msgstr ""
-#: forum/skins/default/templates/user_info.html:76
+#: forum/skins/default/templates/user_info.html:73
msgid "user website"
msgstr ""
-#: forum/skins/default/templates/user_info.html:82
+#: forum/skins/default/templates/user_info.html:79
msgid "location"
msgstr ""
-#: forum/skins/default/templates/user_info.html:89
+#: forum/skins/default/templates/user_info.html:86
msgid "age"
msgstr ""
-#: forum/skins/default/templates/user_info.html:90
+#: forum/skins/default/templates/user_info.html:87
msgid "age unit"
msgstr "years old"
-#: forum/skins/default/templates/user_info.html:96
+#: forum/skins/default/templates/user_info.html:93
msgid "todays unused votes"
msgstr ""
-#: forum/skins/default/templates/user_info.html:97
+#: forum/skins/default/templates/user_info.html:94
msgid "votes left"
msgstr ""
+#: forum/skins/default/templates/user_reputation.html:27
+msgid "Change in karma per question or answer"
+msgstr ""
+
#: forum/skins/default/templates/user_stats.html:12
#, python-format
msgid ""
@@ -2850,19 +2806,19 @@ msgstr[1] ""
msgid "User profile"
msgstr ""
-#: forum/skins/default/templates/user_tabs.html:7 forum/views/users.py:890
+#: forum/skins/default/templates/user_tabs.html:7 forum/views/users.py:894
msgid "overview"
msgstr ""
-#: forum/skins/default/templates/user_tabs.html:9 forum/views/users.py:898
+#: forum/skins/default/templates/user_tabs.html:9 forum/views/users.py:902
msgid "recent activity"
msgstr ""
-#: forum/skins/default/templates/user_tabs.html:12 forum/views/users.py:908
+#: forum/skins/default/templates/user_tabs.html:12 forum/views/users.py:912
msgid "comments and answers to others questions"
msgstr ""
-#: forum/skins/default/templates/user_tabs.html:13 forum/views/users.py:907
+#: forum/skins/default/templates/user_tabs.html:13 forum/views/users.py:911
msgid "responses"
msgstr ""
@@ -2874,11 +2830,11 @@ msgstr "Graph of user karma"
msgid "reputation history"
msgstr "karma history"
-#: forum/skins/default/templates/user_tabs.html:20 forum/views/users.py:934
+#: forum/skins/default/templates/user_tabs.html:20 forum/views/users.py:938
msgid "user vote record"
msgstr ""
-#: forum/skins/default/templates/user_tabs.html:20 forum/views/users.py:933
+#: forum/skins/default/templates/user_tabs.html:20 forum/views/users.py:937
msgid "casted votes"
msgstr "votes"
@@ -2890,11 +2846,11 @@ msgstr ""
msgid "favorites"
msgstr ""
-#: forum/skins/default/templates/user_tabs.html:27 forum/views/users.py:943
+#: forum/skins/default/templates/user_tabs.html:27 forum/views/users.py:947
msgid "email subscription settings"
msgstr ""
-#: forum/skins/default/templates/user_tabs.html:28 forum/views/users.py:942
+#: forum/skins/default/templates/user_tabs.html:28 forum/views/users.py:946
msgid "email subscriptions"
msgstr ""
@@ -2936,323 +2892,6 @@ msgstr ""
msgid "thumb-up off"
msgstr ""
-#: forum/skins/default/templates/auth/auth_settings.html:5
-#: forum/skins/default/templates/auth/auth_settings.html:7
-msgid "Authentication settings"
-msgstr ""
-
-#: forum/skins/default/templates/auth/auth_settings.html:9
-msgid ""
-"These are the external authentication providers currently associated with "
-"your account."
-msgstr ""
-
-#: forum/skins/default/templates/auth/auth_settings.html:12
-msgid "remove"
-msgstr ""
-
-#: forum/skins/default/templates/auth/auth_settings.html:17
-msgid ""
-"You currently have no external authentication provider associated with your "
-"account."
-msgstr ""
-
-#: forum/skins/default/templates/auth/auth_settings.html:19
-msgid "Add new provider"
-msgstr ""
-
-#: forum/skins/default/templates/auth/auth_settings.html:21
-#: forum/skins/default/templates/authopenid/changepw.html:8
-msgid "This is where you can change your password. Make sure you remember it!"
-msgstr ""
-"<span class='strong'>To change your password</span> please fill out and "
-"submit this form"
-
-#: forum/skins/default/templates/auth/auth_settings.html:24
-msgid ""
-"You can set up a password for your account, so you can login using standard "
-"username and password!"
-msgstr ""
-
-#: forum/skins/default/templates/auth/auth_settings.html:31
-msgid "Create password"
-msgstr ""
-
-#: forum/skins/default/templates/auth/complete.html:5
-#: forum/skins/default/templates/authopenid/complete.html:19
-msgid "Connect your OpenID with this site"
-msgstr "New user signup"
-
-#: forum/skins/default/templates/auth/complete.html:8
-#: forum/skins/default/templates/authopenid/complete.html:22
-msgid "Connect your OpenID with your account on this site"
-msgstr "New user signup"
-
-#: forum/skins/default/templates/auth/complete.html:12
-msgid "You are here for the first time with "
-msgstr ""
-
-#: forum/skins/default/templates/auth/complete.html:13
-msgid ""
-"Please create your screen name and save your email address. Saved email "
-"address will let you subscribe for the updates on the most interesting "
-"questions and will be used to create and retrieve your unique avatar image. "
-msgstr ""
-
-#: forum/skins/default/templates/auth/complete.html:15
-#: forum/skins/default/templates/authopenid/complete.html:42
-msgid "This account already exists, please use another."
-msgstr ""
-
-#: forum/skins/default/templates/auth/complete.html:30
-#: forum/skins/default/templates/authopenid/complete.html:57
-msgid "Sorry, looks like we have some errors:"
-msgstr ""
-
-#: forum/skins/default/templates/auth/complete.html:47
-#: forum/skins/default/templates/authopenid/complete.html:82
-msgid "Screen name label"
-msgstr "<strong>Screen Name</strong> (<i>will be shown to others</i>)"
-
-#: forum/skins/default/templates/auth/complete.html:54
-#: forum/skins/default/templates/authopenid/complete.html:89
-msgid "Email address label"
-msgstr ""
-"<strong>Email Address</strong> (<i>will <strong>not</strong> be shared with "
-"anyone, must be valid</i>)"
-
-#: forum/skins/default/templates/auth/complete.html:60
-#: forum/skins/default/templates/auth/signup.html:18
-#: forum/skins/default/templates/authopenid/complete.html:95
-#: forum/skins/default/templates/authopenid/signup.html:18
-msgid "receive updates motivational blurb"
-msgstr ""
-"<strong>Receive forum updates by email</strong> - this will help our "
-"community grow and become more useful.<br/>By default <span "
-"class='orange'>Q&amp;A</span> forum sends up to <strong>one email digest per "
-"week</strong> - only when there is anything new.<br/>If you like, please "
-"adjust this now or any time later from your user account."
-
-#: forum/skins/default/templates/auth/complete.html:64
-#: forum/skins/default/templates/auth/signup.html:22
-#: forum/skins/default/templates/authopenid/complete.html:99
-#: forum/skins/default/templates/authopenid/signup.html:22
-msgid "please select one of the options above"
-msgstr ""
-
-#: forum/skins/default/templates/auth/complete.html:67
-#: forum/skins/default/templates/authopenid/complete.html:102
-msgid "Tag filter tool will be your right panel, once you log in."
-msgstr ""
-
-#: forum/skins/default/templates/auth/complete.html:68
-#: forum/skins/default/templates/authopenid/complete.html:103
-msgid "create account"
-msgstr "Signup"
-
-#: forum/skins/default/templates/auth/complete.html:77
-#: forum/skins/default/templates/authopenid/complete.html:112
-msgid "Existing account"
-msgstr ""
-
-#: forum/skins/default/templates/auth/complete.html:78
-#: forum/skins/default/templates/authopenid/complete.html:113
-msgid "user name"
-msgstr ""
-
-#: forum/skins/default/templates/auth/complete.html:79
-#: forum/skins/default/templates/authopenid/complete.html:114
-msgid "password"
-msgstr ""
-
-#: forum/skins/default/templates/auth/complete.html:86
-#: forum/skins/default/templates/authopenid/complete.html:121
-msgid "Register"
-msgstr ""
-
-#: forum/skins/default/templates/auth/complete.html:87
-#: forum/skins/default/templates/authopenid/complete.html:122
-#: forum/skins/default/templates/authopenid/signin.html:164
-msgid "Forgot your password?"
-msgstr ""
-
-#: forum/skins/default/templates/auth/email_validation.html:6
-#: forum/skins/default/templates/auth/temp_login_email.html:6
-#: forum/skins/default/templates/authopenid/email_validation.txt:2
-msgid "Greetings from the Q&A forum"
-msgstr ""
-
-#: forum/skins/default/templates/auth/email_validation.html:8
-#: forum/skins/default/templates/authopenid/email_validation.txt:4
-msgid "To make use of the Forum, please follow the link below:"
-msgstr ""
-
-#: forum/skins/default/templates/auth/email_validation.html:12
-#: forum/skins/default/templates/authopenid/email_validation.txt:8
-msgid "Following the link above will help us verify your email address."
-msgstr ""
-
-#: forum/skins/default/templates/auth/email_validation.html:14
-#: forum/skins/default/templates/auth/temp_login_email.html:14
-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 ""
-
-#: forum/skins/default/templates/auth/email_validation.html:18
-#: forum/skins/default/templates/auth/temp_login_email.html:18
-msgid ""
-"Sincerely,<br />\n"
-" Forum Administrator"
-msgstr ""
-"Sincerely,\n"
-"Q&A Forum Administrator"
-
-#: forum/skins/default/templates/auth/signin.html:22
-#: forum/skins/default/templates/authopenid/signin.html:5
-#: forum/skins/default/templates/authopenid/signin.html:21
-msgid "User login"
-msgstr "User login"
-
-#: forum/skins/default/templates/auth/signin.html:29
-#: forum/skins/default/templates/authopenid/signin.html:42
-msgid "Click to sign in through any of these services."
-msgstr ""
-"<p><span class=\"big strong\">Please select your favorite login method below."
-"</span></p><p><font color=\"gray\">External login services use <a href="
-"\"http://openid.net\"><b>OpenID</b></a> technology, where your password "
-"always stays confidential between you and your login provider and you don't "
-"have to remember another one.</font></p>"
-
-#: forum/skins/default/templates/auth/signin.html:34
-msgid ""
-"Take the oppurtunity to validate my email next to the external provider I "
-"choose."
-msgstr ""
-
-#: forum/skins/default/templates/auth/signin.html:76
-#: forum/skins/default/templates/auth/signin.html:82
-msgid "Or..."
-msgstr ""
-
-#: forum/skins/default/templates/auth/signin.html:84
-msgid "Click"
-msgstr ""
-
-#: forum/skins/default/templates/auth/signin.html:84
-msgid "if you're having troubles signing in."
-msgstr ""
-
-#: forum/skins/default/templates/auth/signin.html:88
-msgid "Enter your "
-msgstr ""
-
-#: forum/skins/default/templates/auth/signin.html:144
-#: forum/skins/default/templates/authopenid/signin.html:174
-msgid "Why use OpenID?"
-msgstr ""
-
-#: forum/skins/default/templates/auth/signin.html:147
-#: forum/skins/default/templates/authopenid/signin.html:177
-msgid "with openid it is easier"
-msgstr "With the OpenID you don't need to create new username and password."
-
-#: forum/skins/default/templates/auth/signin.html:150
-#: forum/skins/default/templates/authopenid/signin.html:180
-msgid "reuse openid"
-msgstr "You can safely re-use the same login for all OpenID-enabled websites."
-
-#: forum/skins/default/templates/auth/signin.html:153
-#: forum/skins/default/templates/authopenid/signin.html:183
-msgid "openid is widely adopted"
-msgstr ""
-"There are > 160,000,000 OpenID account in use. Over 10,000 sites are OpenID-"
-"enabled."
-
-#: forum/skins/default/templates/auth/signin.html:156
-#: forum/skins/default/templates/authopenid/signin.html:186
-msgid "openid is supported open standard"
-msgstr "OpenID is based on an open standard, supported by many organizations."
-
-#: forum/skins/default/templates/auth/signin.html:161
-#: forum/skins/default/templates/authopenid/signin.html:191
-msgid "Find out more"
-msgstr ""
-
-#: forum/skins/default/templates/auth/signin.html:162
-#: forum/skins/default/templates/authopenid/signin.html:192
-msgid "Get OpenID"
-msgstr ""
-
-#: forum/skins/default/templates/auth/signup.html:4
-#: forum/skins/default/templates/authopenid/signup.html:4
-msgid "Signup"
-msgstr ""
-
-#: forum/skins/default/templates/auth/signup.html:8
-#: forum/skins/default/templates/authopenid/signup.html:8
-msgid "Create login name and password"
-msgstr ""
-
-#: forum/skins/default/templates/auth/signup.html:10
-#: forum/skins/default/templates/authopenid/signup.html:10
-msgid "Traditional signup info"
-msgstr ""
-"<span class='strong big'>If you prefer, create your forum login name and "
-"password here. However</span>, please keep in mind that we also support "
-"<strong>OpenID</strong> login method. With <strong>OpenID</strong> you can "
-"simply reuse your external login (e.g. Gmail or AOL) without ever sharing "
-"your login details with anyone and having to remember yet another password."
-
-#: forum/skins/default/templates/auth/signup.html:25
-#: forum/skins/default/templates/authopenid/signup.html:25
-msgid ""
-"Please read and type in the two words below to help us prevent automated "
-"account creation."
-msgstr ""
-
-#: forum/skins/default/templates/auth/signup.html:27
-#: forum/skins/default/templates/authopenid/signup.html:27
-msgid "Create Account"
-msgstr ""
-
-#: forum/skins/default/templates/auth/signup.html:29
-msgid "return to login page"
-msgstr ""
-
-#: forum/skins/default/templates/auth/temp_login_email.html:8
-msgid "You're seeing this because someone requested a temporary login link"
-msgstr ""
-
-#: forum/skins/default/templates/auth/temp_login_email.html:12
-msgid "Following the link above will give you access to your account."
-msgstr ""
-
-#: forum/skins/default/templates/auth/temp_login_request.html:5
-msgid "Request temporary login key"
-msgstr ""
-
-#: forum/skins/default/templates/auth/temp_login_request.html:7
-msgid "Account: request temporary login key"
-msgstr ""
-
-#: forum/skins/default/templates/auth/temp_login_request.html:8
-msgid ""
-"\n"
-" If you're experiencing problems accessing your account, or if you forgot "
-"your password,\n"
-" here you can request a temporary login key. Fill out your account email "
-"and we'll send you a temporary access link that\n"
-" will enable you to access your account. This token is valid only once "
-"and for a limited period of time.\n"
-" "
-msgstr ""
-
-#: forum/skins/default/templates/auth/temp_login_request.html:25
-msgid "Send link"
-msgstr ""
-
#: forum/skins/default/templates/authopenid/changeemail.html:3
#: forum/skins/default/templates/authopenid/changeemail.html:9
#: forum/skins/default/templates/authopenid/changeemail.html:38
@@ -3386,6 +3025,20 @@ msgstr ""
msgid "Account: change password"
msgstr "Change your password"
+#: forum/skins/default/templates/authopenid/changepw.html:8
+msgid "This is where you can change your password. Make sure you remember it!"
+msgstr ""
+"<span class='strong'>To change your password</span> please fill out and "
+"submit this form"
+
+#: forum/skins/default/templates/authopenid/complete.html:19
+msgid "Connect your OpenID with this site"
+msgstr "New user signup"
+
+#: forum/skins/default/templates/authopenid/complete.html:22
+msgid "Connect your OpenID with your account on this site"
+msgstr "New user signup"
+
#: forum/skins/default/templates/authopenid/complete.html:27
#, python-format
msgid "register new %(provider)s account info, see %(gravatar_faq_url)s"
@@ -3439,6 +3092,68 @@ msgstr ""
"and will be used to create and retrieve your unique avatar image - <a href='%"
"(gravatar_faq_url)s'><strong>gravatar</strong></a>.</p>"
+#: forum/skins/default/templates/authopenid/complete.html:42
+msgid "This account already exists, please use another."
+msgstr ""
+
+#: forum/skins/default/templates/authopenid/complete.html:57
+msgid "Sorry, looks like we have some errors:"
+msgstr ""
+
+#: forum/skins/default/templates/authopenid/complete.html:82
+msgid "Screen name label"
+msgstr "<strong>Screen Name</strong> (<i>will be shown to others</i>)"
+
+#: forum/skins/default/templates/authopenid/complete.html:89
+msgid "Email address label"
+msgstr ""
+"<strong>Email Address</strong> (<i>will <strong>not</strong> be shared with "
+"anyone, must be valid</i>)"
+
+#: forum/skins/default/templates/authopenid/complete.html:95
+#: forum/skins/default/templates/authopenid/signup.html:18
+msgid "receive updates motivational blurb"
+msgstr ""
+"<strong>Receive forum updates by email</strong> - this will help our "
+"community grow and become more useful.<br/>By default <span "
+"class='orange'>Q&amp;A</span> forum sends up to <strong>one email digest per "
+"week</strong> - only when there is anything new.<br/>If you like, please "
+"adjust this now or any time later from your user account."
+
+#: forum/skins/default/templates/authopenid/complete.html:99
+#: forum/skins/default/templates/authopenid/signup.html:22
+msgid "please select one of the options above"
+msgstr ""
+
+#: forum/skins/default/templates/authopenid/complete.html:102
+msgid "Tag filter tool will be your right panel, once you log in."
+msgstr ""
+
+#: forum/skins/default/templates/authopenid/complete.html:103
+msgid "create account"
+msgstr "Signup"
+
+#: forum/skins/default/templates/authopenid/complete.html:112
+msgid "Existing account"
+msgstr ""
+
+#: forum/skins/default/templates/authopenid/complete.html:113
+msgid "user name"
+msgstr ""
+
+#: forum/skins/default/templates/authopenid/complete.html:114
+msgid "password"
+msgstr ""
+
+#: forum/skins/default/templates/authopenid/complete.html:121
+msgid "Register"
+msgstr ""
+
+#: forum/skins/default/templates/authopenid/complete.html:122
+#: forum/skins/default/templates/authopenid/signin.html:168
+msgid "Forgot your password?"
+msgstr ""
+
#: forum/skins/default/templates/authopenid/confirm_email.txt:2
msgid "Thank you for registering at our Q&A forum!"
msgstr ""
@@ -3500,6 +3215,18 @@ msgstr ""
msgid "Delete account permanently"
msgstr ""
+#: forum/skins/default/templates/authopenid/email_validation.txt:2
+msgid "Greetings from the Q&A forum"
+msgstr ""
+
+#: forum/skins/default/templates/authopenid/email_validation.txt:4
+msgid "To make use of the Forum, please follow the link below:"
+msgstr ""
+
+#: forum/skins/default/templates/authopenid/email_validation.txt:8
+msgid "Following the link above will help us verify your email address."
+msgstr ""
+
#: forum/skins/default/templates/authopenid/email_validation.txt:10
msgid ""
"If you beleive that this message was sent in mistake - \n"
@@ -3560,6 +3287,11 @@ msgstr ""
"* login with user name %(username)s and password %(password)s\n"
"* go to your user profile and set the password to something you can remember"
+#: forum/skins/default/templates/authopenid/signin.html:5
+#: forum/skins/default/templates/authopenid/signin.html:21
+msgid "User login"
+msgstr "User login"
+
#: forum/skins/default/templates/authopenid/signin.html:28
#, python-format
msgid ""
@@ -3584,6 +3316,15 @@ msgstr ""
"strong> %(summary)s...\"</i> <span class=\"strong big\">is saved and will be "
"posted once you log in.</span>"
+#: forum/skins/default/templates/authopenid/signin.html:42
+msgid "Click to sign in through any of these services."
+msgstr ""
+"<p><span class=\"big strong\">Please select your favorite login method below."
+"</span></p><p><font color=\"gray\">External login services use <a href="
+"\"http://openid.net\"><b>OpenID</b></a> technology, where your password "
+"always stays confidential between you and your login provider and you don't "
+"have to remember another one.</font></p>"
+
# msgid "Click to sign in through any of these services."
# msgstr ""
# "<p><span class=\"big strong\">Please select your favorite login method below."
@@ -3593,14 +3334,14 @@ msgstr ""
# "have to remember another one. "
# "Askbot option requires your login name and "
# "password entered here.</font></p>"
-#: forum/skins/default/templates/authopenid/signin.html:140
+#: forum/skins/default/templates/authopenid/signin.html:144
msgid "Enter your <span id=\"enter_your_what\">Provider user name</span>"
msgstr ""
"<span class=\"big strong\">Enter your </span><span id=\"enter_your_what\" "
"class='big strong'>Provider user name</span><br/><span class='grey'>(or "
"select another login method above)</span>"
-#: forum/skins/default/templates/authopenid/signin.html:147
+#: forum/skins/default/templates/authopenid/signin.html:151
msgid ""
"Enter your <a class=\"openid_logo\" href=\"http://openid.net\">OpenID</a> "
"web address"
@@ -3609,29 +3350,86 @@ msgstr ""
"openid.net\">OpenID</a> web address</span><br/><span class='grey'>(or choose "
"another login method above)</span>"
-#: forum/skins/default/templates/authopenid/signin.html:149
-#: forum/skins/default/templates/authopenid/signin.html:162
+#: forum/skins/default/templates/authopenid/signin.html:153
+#: forum/skins/default/templates/authopenid/signin.html:166
msgid "Login"
msgstr ""
-#: forum/skins/default/templates/authopenid/signin.html:153
+#: forum/skins/default/templates/authopenid/signin.html:157
msgid "Enter your login name and password"
msgstr ""
"<span class='big strong'>Enter your Askbot login and password</span><br/"
"><span class='grey'>(or select your OpenID provider above)</span>"
-#: forum/skins/default/templates/authopenid/signin.html:157
+#: forum/skins/default/templates/authopenid/signin.html:161
msgid "Login name"
msgstr ""
-#: forum/skins/default/templates/authopenid/signin.html:159
+#: forum/skins/default/templates/authopenid/signin.html:163
msgid "Password"
msgstr ""
-#: forum/skins/default/templates/authopenid/signin.html:163
+#: forum/skins/default/templates/authopenid/signin.html:167
msgid "Create account"
msgstr ""
+#: forum/skins/default/templates/authopenid/signin.html:178
+msgid "Why use OpenID?"
+msgstr ""
+
+#: forum/skins/default/templates/authopenid/signin.html:181
+msgid "with openid it is easier"
+msgstr "With the OpenID you don't need to create new username and password."
+
+#: forum/skins/default/templates/authopenid/signin.html:184
+msgid "reuse openid"
+msgstr "You can safely re-use the same login for all OpenID-enabled websites."
+
+#: forum/skins/default/templates/authopenid/signin.html:187
+msgid "openid is widely adopted"
+msgstr ""
+"There are > 160,000,000 OpenID account in use. Over 10,000 sites are OpenID-"
+"enabled."
+
+#: forum/skins/default/templates/authopenid/signin.html:190
+msgid "openid is supported open standard"
+msgstr "OpenID is based on an open standard, supported by many organizations."
+
+#: forum/skins/default/templates/authopenid/signin.html:195
+msgid "Find out more"
+msgstr ""
+
+#: forum/skins/default/templates/authopenid/signin.html:196
+msgid "Get OpenID"
+msgstr ""
+
+#: forum/skins/default/templates/authopenid/signup.html:4
+msgid "Signup"
+msgstr ""
+
+#: forum/skins/default/templates/authopenid/signup.html:8
+msgid "Create login name and password"
+msgstr ""
+
+#: forum/skins/default/templates/authopenid/signup.html:10
+msgid "Traditional signup info"
+msgstr ""
+"<span class='strong big'>If you prefer, create your forum login name and "
+"password here. However</span>, please keep in mind that we also support "
+"<strong>OpenID</strong> login method. With <strong>OpenID</strong> you can "
+"simply reuse your external login (e.g. Gmail or AOL) without ever sharing "
+"your login details with anyone and having to remember yet another password."
+
+#: forum/skins/default/templates/authopenid/signup.html:25
+msgid ""
+"Please read and type in the two words below to help us prevent automated "
+"account creation."
+msgstr ""
+
+#: forum/skins/default/templates/authopenid/signup.html:27
+msgid "Create Account"
+msgstr ""
+
#: forum/skins/default/templates/authopenid/signup.html:29
msgid "return to OpenID login"
msgstr ""
@@ -3641,26 +3439,26 @@ msgstr ""
msgid "Connect to %(APP_SHORT_NAME)s with Facebook!"
msgstr ""
-#: forum/templatetags/extra_tags.py:167 forum/templatetags/extra_tags.py:194
+#: forum/templatetags/extra_tags.py:177 forum/templatetags/extra_tags.py:204
msgid "reputation points"
msgstr "karma"
-#: forum/templatetags/extra_tags.py:254
+#: forum/templatetags/extra_tags.py:264
msgid "2 days ago"
msgstr ""
-#: forum/templatetags/extra_tags.py:256
+#: forum/templatetags/extra_tags.py:266
msgid "yesterday"
msgstr ""
-#: forum/templatetags/extra_tags.py:258
+#: forum/templatetags/extra_tags.py:268
#, python-format
msgid "%(hr)d hour ago"
msgid_plural "%(hr)d hours ago"
msgstr[0] ""
msgstr[1] ""
-#: forum/templatetags/extra_tags.py:260
+#: forum/templatetags/extra_tags.py:270
#, python-format
msgid "%(min)d min ago"
msgid_plural "%(min)d mins ago"
@@ -3707,6 +3505,10 @@ msgstr "Your email <i>(never shared)</i>"
msgid "email address is required"
msgstr ""
+#: forum/utils/forms.py:111
+msgid "please enter a valid email address"
+msgstr ""
+
#: forum/utils/forms.py:112
msgid "this email is already used by someone else, please choose another"
msgstr ""
@@ -3731,69 +3533,6 @@ msgstr ""
msgid "sorry, entered passwords did not match, please try again"
msgstr ""
-#: forum/views/auth.py:99 forum/views/auth.py:108
-msgid ""
-"Sorry, these login credentials belong to anoother user. Plese terminate your "
-"current session and try again."
-msgstr ""
-
-#: forum/views/auth.py:101
-msgid "You are already logged in with that user."
-msgstr ""
-
-#: forum/views/auth.py:106
-msgid "These login credentials are already associated with your account."
-msgstr ""
-
-#: forum/views/auth.py:112
-msgid "The new credentials are now associated with your account"
-msgstr ""
-
-#: forum/views/auth.py:150
-msgid ""
-"Oops, something went wrong in the middle of this process. Please try again."
-msgstr ""
-
-#: forum/views/auth.py:210
-msgid "Temporary login link"
-msgstr ""
-
-#: forum/views/auth.py:215
-msgid "An email has been sent with your temporary login key"
-msgstr ""
-
-#: forum/views/auth.py:230
-msgid ""
-"You are logged in with a temporary access key, please take the time to fix "
-"your issue with authentication."
-msgstr ""
-
-#: forum/views/auth.py:236
-msgid "Email Validation"
-msgstr ""
-
-#: forum/views/auth.py:247
-msgid "Thank you, your email is now validated."
-msgstr ""
-
-#: forum/views/auth.py:271
-msgid "Your password was changed"
-msgstr ""
-
-#: forum/views/auth.py:273
-msgid "New password set"
-msgstr "New password created"
-
-#: forum/views/auth.py:306
-#, python-format
-msgid "You removed the association with %s"
-msgstr ""
-
-#: forum/views/auth.py:345
-#, python-format
-msgid "Welcome back %s, you are now logged in"
-msgstr ""
-
#: forum/views/commands.py:209
#, python-format
msgid "subscription saved, %(email)s needs validation, see %(details_url)s"
@@ -3817,59 +3556,59 @@ msgstr ""
msgid "We look forward to hearing your feedback! Please, give it next time :)"
msgstr ""
-#: forum/views/users.py:851 forum/views/users.py:855
+#: forum/views/users.py:855 forum/views/users.py:859
msgid "changes saved"
msgstr ""
-#: forum/views/users.py:861
+#: forum/views/users.py:865
msgid "email updates canceled"
msgstr ""
-#: forum/views/users.py:891
+#: forum/views/users.py:895
msgid "user profile"
msgstr ""
-#: forum/views/users.py:892
+#: forum/views/users.py:896
msgid "user profile overview"
msgstr ""
-#: forum/views/users.py:899
+#: forum/views/users.py:903
msgid "recent user activity"
msgstr ""
-#: forum/views/users.py:900
+#: forum/views/users.py:904
msgid "profile - recent activity"
msgstr ""
-#: forum/views/users.py:909
+#: forum/views/users.py:913
msgid "profile - responses"
msgstr ""
-#: forum/views/users.py:917
+#: forum/views/users.py:921
msgid "user reputation in the community"
msgstr "user karma"
-#: forum/views/users.py:918
+#: forum/views/users.py:922
msgid "profile - user reputation"
msgstr "Profile - User's Karma"
-#: forum/views/users.py:924
+#: forum/views/users.py:928
msgid "favorite questions"
msgstr ""
-#: forum/views/users.py:925
+#: forum/views/users.py:929
msgid "users favorite questions"
msgstr ""
-#: forum/views/users.py:926
+#: forum/views/users.py:930
msgid "profile - favorite questions"
msgstr ""
-#: forum/views/users.py:935
+#: forum/views/users.py:939
msgid "profile - votes"
msgstr ""
-#: forum/views/users.py:944
+#: forum/views/users.py:948
msgid "profile - email subscriptions"
msgstr ""
@@ -3897,65 +3636,23 @@ msgstr ""
msgid "books/"
msgstr ""
-#: forum_modules/facebookauth/authentication.py:29
-msgid "Sorry, your Facebook session has expired, please try again"
-msgstr ""
-
-#: forum_modules/facebookauth/authentication.py:31
-msgid ""
-"The authentication with Facebook connect failed due to an invalid signature"
-msgstr ""
-
-#: forum_modules/facebookauth/authentication.py:33
-msgid ""
-"The authentication with Facebook connect failed, cannot find authentication "
-"tokens"
-msgstr ""
-
-#: forum_modules/localauth/urls.py:7
-msgid "local/"
-msgstr ""
-
-#: forum_modules/localauth/views.py:23
-msgid "A validation email has been sent to your email address. "
-msgstr ""
-
-#: forum_modules/oauthauth/consumer.py:33
-msgid "Error, the oauth token is not on the server"
-msgstr ""
-
-#: forum_modules/oauthauth/consumer.py:38
-msgid "Something went wrong! Auth tokens do not match"
-msgstr ""
-
-#: forum_modules/openidauth/consumer.py:40
-msgid "Sorry, but your input is not a valid OpenId"
-msgstr ""
-
-#: forum_modules/openidauth/consumer.py:92
-msgid "The OpenId authentication request was canceled"
-msgstr ""
-
-#: forum_modules/openidauth/consumer.py:94
-msgid "The OpenId authentication failed: "
-msgstr ""
-
-#: forum_modules/openidauth/consumer.py:96
-msgid "Setup needed"
-msgstr ""
-
-#: forum_modules/openidauth/consumer.py:98
-msgid "The OpenId authentication failed with an unknown status: "
-msgstr ""
-
-#: forum_modules/openidauth/templates/openidurl.html:7
-msgid "Enter your OpenId Url"
-msgstr ""
-
#: stackexchange/management/commands/load_stackexchange.py:124
msgid "Congratulations, you are now an Administrator"
msgstr ""
+#~ msgid "avatar, see %(gravatar_faq_url)s"
+#~ msgstr "<a href='%(gravatar_faq_url)s'>gravatar</a>"
+
+#~ msgid ""
+#~ "Sincerely,<br />\n"
+#~ " Forum Administrator"
+#~ msgstr ""
+#~ "Sincerely,\n"
+#~ "Q&A Forum Administrator"
+
+#~ msgid "New password set"
+#~ msgstr "New password created"
+
#~ msgid ""
#~ "\n"
#~ " have total %(q_num)s unanswered questions\n"