From bdf1cc4f9dd3f0ac06ba1af3c7d35c72cc358297 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev
Date: Mon, 8 Feb 2010 19:13:04 -0500
Subject: fixed a little bug that i have planted into fbconnect before, removed
unused files fixed email signup form validation
---
locale/en/LC_MESSAGES/django.mo | Bin 26619 -> 26986 bytes
locale/en/LC_MESSAGES/django.po | 714 ++++++++++++++++++++--------------------
2 files changed, 352 insertions(+), 362 deletions(-)
(limited to 'locale/en')
diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index ef3007a0..38120e49 100644
Binary files a/locale/en/LC_MESSAGES/django.mo and b/locale/en/LC_MESSAGES/django.mo differ
diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index ee40fa36..bfec60c0 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-12-09 08:54-0800\n"
+"POT-Creation-Date: 2010-02-08 18:43-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -16,297 +16,228 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: django_authopenid/forms.py:70
-msgid "choose a username"
-msgstr "Choose screen name"
-
-#: django_authopenid/forms.py:76
-msgid "user name is required"
-msgstr ""
-
-#: django_authopenid/forms.py:77
-msgid "sorry, this name is taken, please choose another"
-msgstr ""
-
-#: django_authopenid/forms.py:78
-msgid "sorry, this name is not allowed, please choose another"
-msgstr ""
-
-#: django_authopenid/forms.py:79
-msgid "sorry, there is no user with this name"
-msgstr ""
-
-#: django_authopenid/forms.py:80
-msgid "sorry, we have a serious error - user name is taken by several users"
-msgstr ""
-
-#: django_authopenid/forms.py:81
-msgid "user name can only consist of letters, empty space and underscore"
-msgstr ""
-
-#: django_authopenid/forms.py:116
-msgid "your email address"
-msgstr "Your email (never shared)"
-
-#: django_authopenid/forms.py:117
-msgid "email address is required"
-msgstr ""
-
-#: django_authopenid/forms.py:118
-msgid "please enter a valid email address"
-msgstr ""
-
-#: django_authopenid/forms.py:119
-msgid "this email is already used by someone else, please choose another"
-msgstr ""
-
-#: django_authopenid/forms.py:163 django_authopenid/views.py:118
+#: django_authopenid/forms.py:71 django_authopenid/views.py:118
msgid "i-names are not supported"
msgstr ""
-#: django_authopenid/forms.py:219
+#: django_authopenid/forms.py:134
msgid "Account with this name already exists on the forum"
msgstr ""
-#: django_authopenid/forms.py:220
+#: django_authopenid/forms.py:135
msgid "can't have two logins to the same account yet, sorry."
msgstr ""
-#: django_authopenid/forms.py:242
+#: django_authopenid/forms.py:157
msgid "Please enter valid username and password (both are case-sensitive)."
msgstr ""
-#: django_authopenid/forms.py:245 django_authopenid/forms.py:295
+#: django_authopenid/forms.py:160 django_authopenid/forms.py:210
msgid "This account is inactive."
msgstr ""
-#: django_authopenid/forms.py:247
+#: django_authopenid/forms.py:162
msgid "Login failed."
msgstr ""
-#: django_authopenid/forms.py:249
+#: django_authopenid/forms.py:164
msgid "Please enter username and password"
msgstr ""
-#: django_authopenid/forms.py:251
+#: django_authopenid/forms.py:166
msgid "Please enter your password"
msgstr ""
-#: django_authopenid/forms.py:253
+#: django_authopenid/forms.py:168
msgid "Please enter user name"
msgstr ""
-#: django_authopenid/forms.py:291
+#: django_authopenid/forms.py:206
msgid ""
"Please enter a valid username and password. Note that "
"both fields are case-sensitive."
msgstr ""
-#: django_authopenid/forms.py:313
-msgid "choose password"
-msgstr "Password"
-
-#: django_authopenid/forms.py:314
-msgid "password is required"
-msgstr ""
-
-#: django_authopenid/forms.py:317
-msgid "retype password"
-msgstr "Password (please retype)"
-
-#: django_authopenid/forms.py:318
-msgid "please, retype your password"
-msgstr ""
-
-#: django_authopenid/forms.py:319
-msgid "sorry, entered passwords did not match, please try again"
-msgstr ""
-
-#: django_authopenid/forms.py:344
+#: django_authopenid/forms.py:229
msgid "Current password"
msgstr ""
-#: django_authopenid/forms.py:346
-msgid "New password"
-msgstr ""
-
-#: django_authopenid/forms.py:348
-msgid "Retype new password"
-msgstr ""
-
-#: django_authopenid/forms.py:359
+#: django_authopenid/forms.py:240
msgid ""
"Old password is incorrect. Please enter the correct "
"password."
msgstr ""
-#: django_authopenid/forms.py:371
-msgid "new passwords do not match"
-msgstr ""
-
-#: django_authopenid/forms.py:435
+#: django_authopenid/forms.py:305
msgid "Your user name (required)"
msgstr ""
-#: django_authopenid/forms.py:450
+#: django_authopenid/forms.py:320
msgid "Incorrect username."
msgstr "sorry, there is no such user name"
-#: django_authopenid/urls.py:9 django_authopenid/urls.py:10
-#: django_authopenid/urls.py:11 django_authopenid/urls.py:13 forum/urls.py:24
+#: 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:29
msgid "signin/"
msgstr ""
-#: django_authopenid/urls.py:10
+#: django_authopenid/urls.py:24 fbconnect/urls.py:13 fbconnect/urls.py:17
msgid "newquestion/"
msgstr ""
-#: django_authopenid/urls.py:11
+#: django_authopenid/urls.py:25 fbconnect/urls.py:14 fbconnect/urls.py:18
msgid "newanswer/"
msgstr ""
-#: django_authopenid/urls.py:12
+#: django_authopenid/urls.py:26
msgid "signout/"
msgstr ""
-#: django_authopenid/urls.py:13
+#: django_authopenid/urls.py:27
msgid "complete/"
msgstr ""
-#: django_authopenid/urls.py:15
-msgid "external-login/"
-msgstr ""
-
-#: django_authopenid/urls.py:16
+#: django_authopenid/urls.py:29 fbconnect/urls.py:16 fbconnect/urls.py:17
+#: fbconnect/urls.py:18
msgid "register/"
msgstr ""
-#: django_authopenid/urls.py:17
+#: django_authopenid/urls.py:30
msgid "signup/"
msgstr ""
-#: django_authopenid/urls.py:19
+#: django_authopenid/urls.py:32
msgid "sendpw/"
msgstr ""
-#: django_authopenid/urls.py:20 django_authopenid/urls.py:24
+#: django_authopenid/urls.py:33 django_authopenid/urls.py:37
msgid "password/"
msgstr ""
-#: django_authopenid/urls.py:20
+#: django_authopenid/urls.py:33
msgid "confirm/"
msgstr ""
-#: django_authopenid/urls.py:23
+#: django_authopenid/urls.py:36
msgid "account_settings"
msgstr ""
-#: django_authopenid/urls.py:25 django_authopenid/urls.py:26
-#: django_authopenid/urls.py:27 django_authopenid/urls.py:28
+#: django_authopenid/urls.py:38 django_authopenid/urls.py:39
+#: django_authopenid/urls.py:40 django_authopenid/urls.py:41
msgid "email/"
msgstr ""
-#: django_authopenid/urls.py:25
+#: django_authopenid/urls.py:38
msgid "validate/"
msgstr ""
-#: django_authopenid/urls.py:26
+#: django_authopenid/urls.py:39
msgid "change/"
msgstr ""
-#: django_authopenid/urls.py:27
+#: django_authopenid/urls.py:40
msgid "sendkey/"
msgstr ""
-#: django_authopenid/urls.py:28
+#: django_authopenid/urls.py:41
msgid "verify/"
msgstr ""
-#: django_authopenid/urls.py:29
+#: django_authopenid/urls.py:42
msgid "openid/"
msgstr ""
-#: django_authopenid/urls.py:30 forum/urls.py:44 forum/urls.py:48
+#: django_authopenid/urls.py:43 forum/urls.py:49 forum/urls.py:53
msgid "delete/"
msgstr ""
-#: django_authopenid/views.py:124
+#: django_authopenid/urls.py:51
+msgid "external-login/forgot-password/"
+msgstr ""
+
+#: django_authopenid/urls.py:54
+msgid "external-login/signup/"
+msgstr ""
+
+#: django_authopenid/views.py:125
#, python-format
msgid "OpenID %(openid_url)s is invalid"
msgstr ""
-#: django_authopenid/views.py:532
+#: django_authopenid/views.py:593
msgid "Welcome email subject line"
msgstr "Welcome to the Q&A forum"
-#: django_authopenid/views.py:627
+#: django_authopenid/views.py:699
msgid "Password changed."
msgstr ""
-#: django_authopenid/views.py:639 django_authopenid/views.py:645
+#: django_authopenid/views.py:711 django_authopenid/views.py:717
#, python-format
msgid "your email needs to be validated see %(details_url)s"
msgstr ""
"Your email needs to be validated. Please see details here."
-#: django_authopenid/views.py:666
+#: django_authopenid/views.py:738
msgid "Email verification subject line"
msgstr "Verification Email from Q&A forum"
-#: django_authopenid/views.py:752
+#: django_authopenid/views.py:829
msgid "your email was not changed"
msgstr ""
-#: django_authopenid/views.py:799 django_authopenid/views.py:951
+#: django_authopenid/views.py:877 django_authopenid/views.py:1035
#, python-format
msgid "No OpenID %s found associated in our database"
msgstr ""
-#: django_authopenid/views.py:803 django_authopenid/views.py:958
+#: django_authopenid/views.py:881 django_authopenid/views.py:1042
#, python-format
msgid "The OpenID %s isn't associated to current user logged in"
msgstr ""
-#: django_authopenid/views.py:811
+#: django_authopenid/views.py:889
msgid "Email Changed."
msgstr ""
-#: django_authopenid/views.py:886
+#: django_authopenid/views.py:967
msgid "This OpenID is already associated with another account."
msgstr ""
-#: django_authopenid/views.py:891
+#: django_authopenid/views.py:972
#, python-format
msgid "OpenID %s is now associated with your account."
msgstr ""
-#: django_authopenid/views.py:961
+#: django_authopenid/views.py:1045
msgid "Account deleted."
msgstr ""
-#: django_authopenid/views.py:1004
+#: django_authopenid/views.py:1097
msgid "Request for new password"
msgstr ""
-#: django_authopenid/views.py:1017
+#: django_authopenid/views.py:1111
msgid "A new password and the activation link were sent to your email address."
msgstr ""
-#: django_authopenid/views.py:1047
+#: django_authopenid/views.py:1143
#, python-format
msgid ""
"Could not change password. Confirmation key '%s' is not "
"registered."
msgstr ""
-#: django_authopenid/views.py:1056
+#: django_authopenid/views.py:1153
msgid ""
"Can not change password. User don't exist anymore in our "
"database."
msgstr ""
-#: django_authopenid/views.py:1065
+#: django_authopenid/views.py:1163
#, python-format
msgid "Password changed for %s. You may now sign in."
msgstr ""
@@ -439,7 +370,7 @@ msgstr ""
msgid "[deleted]"
msgstr ""
-#: forum/const.py:87 forum/views.py:849 forum/views.py:868
+#: forum/const.py:87 forum/views.py:796 forum/views.py:815
msgid "initial version"
msgstr ""
@@ -452,7 +383,7 @@ msgid "exclude ignored tags"
msgstr ""
#: forum/const.py:92
-msgid "allow only interesting tags"
+msgid "allow only selected tags"
msgstr ""
#: forum/feed.py:18
@@ -463,373 +394,384 @@ msgstr ""
msgid "latest questions"
msgstr ""
-#: forum/feed.py:19 forum/urls.py:52
-msgid "question/"
-msgstr ""
-
-#: forum/forms.py:16 templates/answer_edit_tips.html:35
+#: forum/forms.py:18 templates/answer_edit_tips.html:35
#: templates/answer_edit_tips.html.py:39 templates/question_edit_tips.html:32
#: templates/question_edit_tips.html:37
msgid "title"
msgstr ""
-#: forum/forms.py:17
+#: forum/forms.py:19
msgid "please enter a descriptive title for your question"
msgstr ""
-#: forum/forms.py:22
+#: forum/forms.py:24
msgid "title must be > 10 characters"
msgstr ""
-#: forum/forms.py:31
+#: forum/forms.py:33
msgid "content"
msgstr ""
-#: forum/forms.py:37
+#: forum/forms.py:39
msgid "question content must be > 10 characters"
msgstr ""
-#: forum/forms.py:47 templates/header.html:28 templates/header.html.py:62
+#: forum/forms.py:49 templates/header.html:28 templates/header.html.py:56
msgid "tags"
msgstr ""
-#: forum/forms.py:49
+#: forum/forms.py:51
msgid ""
"Tags are short keywords, with no spaces within. Up to five tags can be used."
msgstr ""
-#: forum/forms.py:56 templates/question_retag.html:39
+#: forum/forms.py:58 templates/question_retag.html:39
msgid "tags are required"
msgstr ""
-#: forum/forms.py:62
+#: forum/forms.py:64
msgid "please use 5 tags or less"
msgstr ""
-#: forum/forms.py:65
+#: forum/forms.py:67
msgid "tags must be shorter than 20 characters"
msgstr ""
-#: forum/forms.py:69
+#: forum/forms.py:71
msgid ""
"please use following characters in tags: letters 'a-z', numbers, and "
"characters '.-_#'"
msgstr ""
-#: forum/forms.py:79 templates/index.html:61 templates/index.html.py:73
+#: forum/forms.py:81 templates/index.html:61 templates/index.html.py:73
#: templates/post_contributor_info.html:7
#: templates/question_summary_list_roll.html:26
#: templates/question_summary_list_roll.html:38 templates/questions.html:92
-#: templates/questions.html.py:104 templates/unanswered.html:51
-#: templates/unanswered.html.py:63
+#: templates/questions.html.py:104
msgid "community wiki"
msgstr ""
-#: forum/forms.py:80
+#: forum/forms.py:82
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:96
+#: forum/forms.py:98
msgid "update summary:"
msgstr ""
-#: forum/forms.py:97
+#: forum/forms.py:99
msgid ""
"enter a brief summary of your revision (e.g. fixed spelling, grammar, "
"improved style, this field is optional)"
msgstr ""
-#: forum/forms.py:100
+#: forum/forms.py:102
msgid "Automatically accept user's contributions for the email updates"
msgstr ""
-#: forum/forms.py:113
+#: forum/forms.py:118
msgid "Your name:"
msgstr ""
-#: forum/forms.py:114
+#: forum/forms.py:119
msgid "Email (not shared with anyone):"
msgstr ""
-#: forum/forms.py:115
+#: forum/forms.py:120
msgid "Your message:"
msgstr ""
-#: forum/forms.py:197
+#: forum/forms.py:202
msgid "this email does not have to be linked to gravatar"
msgstr ""
-#: forum/forms.py:198
+#: forum/forms.py:204
msgid "Screen name"
msgstr ""
-#: forum/forms.py:199
+#: forum/forms.py:205
msgid "Real name"
msgstr ""
-#: forum/forms.py:200
+#: forum/forms.py:206
msgid "Website"
msgstr ""
-#: forum/forms.py:201
+#: forum/forms.py:207
msgid "Location"
msgstr ""
-#: forum/forms.py:202
+#: forum/forms.py:208
msgid "Date of birth"
msgstr ""
-#: forum/forms.py:202
+#: forum/forms.py:208
msgid "will not be shown, used to calculate age, format: YYYY-MM-DD"
msgstr ""
-#: forum/forms.py:203 templates/authopenid/settings.html:21
+#: forum/forms.py:209 templates/authopenid/settings.html:21
msgid "Profile"
msgstr ""
-#: forum/forms.py:231 forum/forms.py:232
+#: forum/forms.py:240 forum/forms.py:241
msgid "this email has already been registered, please use another one"
msgstr ""
-#: forum/forms.py:238
+#: forum/forms.py:247
msgid "Choose email tag filter"
msgstr ""
-#: forum/forms.py:245 forum/forms.py:246
+#: forum/forms.py:262 forum/forms.py:263
msgid "weekly"
msgstr ""
-#: forum/forms.py:245 forum/forms.py:246
+#: forum/forms.py:262 forum/forms.py:263
msgid "no email"
msgstr ""
-#: forum/forms.py:246
+#: forum/forms.py:263
msgid "daily"
msgstr ""
-#: forum/forms.py:261
+#: forum/forms.py:278
msgid "Asked by me"
msgstr ""
-#: forum/forms.py:264
+#: forum/forms.py:281
msgid "Answered by me"
msgstr ""
-#: forum/forms.py:267
+#: forum/forms.py:284
msgid "Individually selected"
msgstr ""
-#: forum/forms.py:270
+#: forum/forms.py:287
msgid "Entire forum (tag filtered)"
msgstr ""
-#: forum/models.py:51
-msgid "Entire forum"
+#: forum/forms.py:341
+msgid "okay, let's try!"
+msgstr ""
+
+#: forum/forms.py:342
+msgid "no OSQA community email please, thanks"
+msgstr ""
+
+#: forum/forms.py:345
+msgid "please choose one of the options above"
msgstr ""
#: forum/models.py:52
-msgid "Questions that I asked"
+msgid "Entire forum"
msgstr ""
#: forum/models.py:53
-msgid "Questions that I answered"
+msgid "Questions that I asked"
msgstr ""
#: forum/models.py:54
+msgid "Questions that I answered"
+msgstr ""
+
+#: forum/models.py:55
msgid "Individually selected questions"
msgstr ""
-#: forum/models.py:57
+#: forum/models.py:58
msgid "Weekly"
msgstr ""
-#: forum/models.py:58
+#: forum/models.py:59
msgid "Daily"
msgstr ""
-#: forum/models.py:59
+#: forum/models.py:60
msgid "No email"
msgstr ""
-#: forum/models.py:301
+#: forum/models.py:321
#, python-format
msgid "%(author)s modified the question"
msgstr ""
-#: forum/models.py:305
+#: forum/models.py:325
#, python-format
msgid "%(people)s posted %(new_answer_count)s new answers"
msgstr ""
-#: forum/models.py:310
+#: forum/models.py:330
#, python-format
msgid "%(people)s commented the question"
msgstr ""
-#: forum/models.py:315
+#: forum/models.py:335
#, python-format
msgid "%(people)s commented answers"
msgstr ""
-#: forum/models.py:317
+#: forum/models.py:337
#, python-format
msgid "%(people)s commented an answer"
msgstr ""
-#: forum/models.py:348
+#: forum/models.py:368
msgid "interesting"
msgstr ""
-#: forum/models.py:348
+#: forum/models.py:368
msgid "ignored"
msgstr ""
-#: forum/models.py:511 templates/badges.html:53
+#: forum/models.py:541 templates/badges.html:53
msgid "gold"
msgstr ""
-#: forum/models.py:512 templates/badges.html:61
+#: forum/models.py:542 templates/badges.html:61
msgid "silver"
msgstr ""
-#: forum/models.py:513 templates/badges.html:68
+#: forum/models.py:543 templates/badges.html:68
msgid "bronze"
msgstr ""
-#: forum/urls.py:21
+#: forum/urls.py:26
msgid "upfiles/"
msgstr ""
-#: forum/urls.py:25
+#: forum/urls.py:30
msgid "about/"
msgstr ""
-#: forum/urls.py:26
+#: forum/urls.py:31
msgid "faq/"
msgstr ""
-#: forum/urls.py:27
+#: forum/urls.py:32
msgid "privacy/"
msgstr ""
-#: forum/urls.py:28
+#: forum/urls.py:33
msgid "logout/"
msgstr ""
-#: forum/urls.py:29 forum/urls.py:30 forum/urls.py:31 forum/urls.py:48
+#: forum/urls.py:34 forum/urls.py:35 forum/urls.py:36 forum/urls.py:53
msgid "answers/"
msgstr ""
-#: forum/urls.py:29 forum/urls.py:41 forum/urls.py:44 forum/urls.py:48
+#: forum/urls.py:34 forum/urls.py:46 forum/urls.py:49 forum/urls.py:53
msgid "comments/"
msgstr ""
-#: forum/urls.py:30 forum/urls.py:35 forum/urls.py:70
+#: forum/urls.py:35 forum/urls.py:40 forum/urls.py:75
#: templates/user_info.html:45
msgid "edit/"
msgstr ""
-#: forum/urls.py:31 forum/urls.py:40
+#: forum/urls.py:36 forum/urls.py:45
msgid "revisions/"
msgstr ""
-#: forum/urls.py:32 forum/urls.py:33 forum/urls.py:34 forum/urls.py:35
-#: forum/urls.py:36 forum/urls.py:37 forum/urls.py:38 forum/urls.py:39
-#: forum/urls.py:40 forum/urls.py:41 forum/urls.py:44
+#: forum/urls.py:37 forum/urls.py:38 forum/urls.py:39 forum/urls.py:40
+#: forum/urls.py:41 forum/urls.py:42 forum/urls.py:43 forum/urls.py:44
+#: forum/urls.py:45 forum/urls.py:46 forum/urls.py:49
msgid "questions/"
msgstr ""
-#: forum/urls.py:33 forum/urls.py:80
+#: forum/urls.py:38 forum/urls.py:85
msgid "ask/"
msgstr ""
-#: forum/urls.py:34
+#: forum/urls.py:39
msgid "unanswered/"
msgstr ""
-#: forum/urls.py:36
+#: forum/urls.py:41
msgid "close/"
msgstr ""
-#: forum/urls.py:37
+#: forum/urls.py:42
msgid "reopen/"
msgstr ""
-#: forum/urls.py:38
+#: forum/urls.py:43
msgid "answer/"
msgstr ""
-#: forum/urls.py:39
+#: forum/urls.py:44
msgid "vote/"
msgstr ""
-#: forum/urls.py:42
+#: forum/urls.py:47
msgid "command/"
msgstr ""
-#: forum/urls.py:53 forum/urls.py:54
+#: forum/urls.py:57 forum/views.py:440
+msgid "question/"
+msgstr ""
+
+#: forum/urls.py:58 forum/urls.py:59
msgid "tags/"
msgstr ""
-#: forum/urls.py:56 forum/urls.py:60
+#: forum/urls.py:61 forum/urls.py:65
msgid "mark-tag/"
msgstr ""
-#: forum/urls.py:56
+#: forum/urls.py:61
msgid "interesting/"
msgstr ""
-#: forum/urls.py:60
+#: forum/urls.py:65
msgid "ignored/"
msgstr ""
-#: forum/urls.py:64
+#: forum/urls.py:69
msgid "unmark-tag/"
msgstr ""
-#: forum/urls.py:68 forum/urls.py:70 forum/urls.py:71
+#: forum/urls.py:73 forum/urls.py:75 forum/urls.py:76
msgid "users/"
msgstr ""
-#: forum/urls.py:69
+#: forum/urls.py:74
msgid "moderate-user/"
msgstr ""
-#: forum/urls.py:72 forum/urls.py:73
+#: forum/urls.py:77 forum/urls.py:78
msgid "badges/"
msgstr ""
-#: forum/urls.py:74
+#: forum/urls.py:79
msgid "messages/"
msgstr ""
-#: forum/urls.py:74
+#: forum/urls.py:79
msgid "markread/"
msgstr ""
-#: forum/urls.py:76
+#: forum/urls.py:81
msgid "nimda/"
msgstr ""
-#: forum/urls.py:78
+#: forum/urls.py:83
msgid "upload/"
msgstr ""
-#: forum/urls.py:79 forum/urls.py:80 forum/urls.py:81
+#: forum/urls.py:84 forum/urls.py:85 forum/urls.py:86
msgid "books/"
msgstr ""
-#: forum/urls.py:82
+#: forum/urls.py:87
msgid "search/"
msgstr ""
-#: forum/urls.py:83
+#: forum/urls.py:88
msgid "feedback/"
msgstr ""
-#: forum/urls.py:84
+#: forum/urls.py:89 forum/urls.py:90
msgid "account/"
msgstr ""
@@ -929,49 +871,49 @@ msgstr ""
msgid "We look forward to hearing your feedback! Please, give it next time :)"
msgstr ""
-#: forum/views.py:1150
+#: forum/views.py:1098
#, python-format
msgid "subscription saved, %(email)s needs validation, see %(details_url)s"
msgstr ""
"Your subscription is saved, but email address %(email)s needs to be "
"validated, please see more details here"
-#: forum/views.py:1158
+#: forum/views.py:1106
msgid "email update frequency has been set to daily"
msgstr ""
-#: forum/views.py:2032
+#: forum/views.py:1982 forum/views.py:1986
msgid "changes saved"
msgstr ""
-#: forum/views.py:2038
+#: forum/views.py:1992
msgid "email updates canceled"
msgstr ""
-#: forum/views.py:2207
+#: forum/views.py:2159
msgid "uploading images is limited to users with >60 reputation points"
msgstr "sorry, file uploading requires karma >60"
-#: forum/views.py:2209
+#: forum/views.py:2161
msgid "allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'"
msgstr ""
-#: forum/views.py:2211
+#: forum/views.py:2163
#, python-format
msgid "maximum upload file size is %sK"
msgstr ""
-#: forum/views.py:2213
+#: forum/views.py:2165
#, python-format
msgid ""
"Error uploading file. Please contact the site administrator. Thank you. %s"
msgstr ""
-#: forum/management/commands/send_email_alerts.py:160
+#: forum/management/commands/send_email_alerts.py:156
msgid "email update message subject"
msgstr "news from Q&A forum"
-#: forum/management/commands/send_email_alerts.py:161
+#: forum/management/commands/send_email_alerts.py:158
#, python-format
msgid "%(name)s, this is an update message header for a question"
msgid_plural "%(name)s, this is an update message header for %(num)d questions"
@@ -982,11 +924,11 @@ msgstr[1] ""
"Dear %(name)s,
The following %(num)d questions have been updated on "
"the Q&A forum:
"
-#: forum/management/commands/send_email_alerts.py:172
+#: forum/management/commands/send_email_alerts.py:169
msgid "new question"
msgstr ""
-#: forum/management/commands/send_email_alerts.py:182
+#: forum/management/commands/send_email_alerts.py:179
#, python-format
msgid "There is also one question which was recently "
msgid_plural ""
@@ -994,12 +936,12 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: forum/management/commands/send_email_alerts.py:187
+#: forum/management/commands/send_email_alerts.py:184
msgid ""
"Perhaps you could look up previously sent forum reminders in your mailbox."
msgstr ""
-#: forum/management/commands/send_email_alerts.py:191
+#: forum/management/commands/send_email_alerts.py:188
#, python-format
msgid ""
"go to %(link)s to change frequency of email updates or %(email)s "
@@ -1011,39 +953,31 @@ msgstr ""
"administrator at %(email)s.
Sincerely,
Your friendly Q&A forum "
"server.
"
-#: forum/templatetags/extra_tags.py:163 forum/templatetags/extra_tags.py:192
+#: forum/templatetags/extra_tags.py:164 forum/templatetags/extra_tags.py:193
#: templates/header.html:33
msgid "badges"
msgstr ""
-#: forum/templatetags/extra_tags.py:164 forum/templatetags/extra_tags.py:191
+#: forum/templatetags/extra_tags.py:165 forum/templatetags/extra_tags.py:192
msgid "reputation points"
msgstr "karma"
-#: forum/templatetags/extra_tags.py:247
-msgid "%b %d at %H:%M"
-msgstr ""
-
-#: forum/templatetags/extra_tags.py:249
-msgid "%b %d '%y at %H:%M"
-msgstr ""
-
-#: forum/templatetags/extra_tags.py:251
+#: forum/templatetags/extra_tags.py:252
msgid "2 days ago"
msgstr ""
-#: forum/templatetags/extra_tags.py:253
+#: forum/templatetags/extra_tags.py:254
msgid "yesterday"
msgstr ""
-#: forum/templatetags/extra_tags.py:255
+#: forum/templatetags/extra_tags.py:256
#, python-format
msgid "%(hr)d hour ago"
msgid_plural "%(hr)d hours ago"
msgstr[0] ""
msgstr[1] ""
-#: forum/templatetags/extra_tags.py:257
+#: forum/templatetags/extra_tags.py:258
#, python-format
msgid "%(min)d min ago"
msgid_plural "%(min)d mins ago"
@@ -1121,38 +1055,6 @@ msgstr ""
msgid "About"
msgstr ""
-#: templates/about.html:21
-msgid ""
-"CNPROG Q&A is a "
-"collaboratively edited question\n"
-" and answer site created for the CNPROG "
-"community.\n"
-" "
-msgstr ""
-
-#: templates/about.html:25
-msgid ""
-"Here you can ask and answer questions, "
-"comment\n"
-" and vote for the questions of others and their answers. "
-"Both questions and answers\n"
-" can be revised and improved. Questions can be "
-"tagged with\n"
-" the relevant keywords to simplify future access and organize the "
-"accumulated material."
-msgstr ""
-
-#: templates/about.html:31
-msgid ""
-"This Q&A site is moderated by its members, "
-"hopefully - including yourself!\n"
-" Moderation rights are gradually assigned to the site users based on the "
-"accumulated \"reputation\"\n"
-" points. These points are added to the users account when others vote for "
-"his/her questions or answers.\n"
-" These points (very) roughly reflect the level of trust of the community."
-msgstr ""
-
#: templates/answer_edit.html:5 templates/answer_edit.html.py:48
msgid "Edit answer"
msgstr ""
@@ -1436,7 +1338,7 @@ msgstr ""
#: templates/book.html:105 templates/index.html:49
#: templates/question_summary_list_roll.html:14 templates/questions.html:80
-#: templates/unanswered.html:39 templates/users_questions.html:32
+#: templates/users_questions.html:32
msgid "votes"
msgstr ""
@@ -1446,14 +1348,13 @@ msgstr ""
#: templates/book.html:115 templates/index.html:50
#: templates/question_summary_list_roll.html:15 templates/questions.html:81
-#: templates/unanswered.html:40 templates/users_questions.html:40
+#: templates/users_questions.html:40
msgid "views"
msgstr ""
#: templates/book.html:125 templates/index.html:105
#: templates/question.html:480 templates/question_summary_list_roll.html:52
#: templates/questions.html:136 templates/tags.html:49
-#: templates/unanswered.html:95 templates/unanswered.html.py:122
#: templates/users_questions.html:52
msgid "using tags"
msgstr ""
@@ -1699,7 +1600,7 @@ msgstr ""
"Please ask your question, help make our "
"community better!"
-#: templates/faq.html:128 templates/header.html:27 templates/header.html.py:61
+#: templates/faq.html:128 templates/header.html:27 templates/header.html.py:55
msgid "questions"
msgstr ""
@@ -1775,18 +1676,10 @@ msgid "faq"
msgstr ""
#: templates/footer.html:10
-msgid "blog"
-msgstr ""
-
-#: templates/footer.html:11
-msgid "contact us"
-msgstr ""
-
-#: templates/footer.html:12
msgid "privacy policy"
msgstr ""
-#: templates/footer.html:21
+#: templates/footer.html:19
msgid "give feedback"
msgstr ""
@@ -1802,7 +1695,7 @@ msgstr ""
msgid "back to home page"
msgstr ""
-#: templates/header.html:29 templates/header.html.py:63
+#: templates/header.html:29 templates/header.html.py:57
msgid "users"
msgstr ""
@@ -1814,15 +1707,11 @@ msgstr ""
msgid "unanswered questions"
msgstr "unanswered"
-#: templates/header.html:38
-msgid "my profile"
-msgstr ""
-
-#: templates/header.html:42
+#: templates/header.html:36
msgid "ask a question"
msgstr ""
-#: templates/header.html:57
+#: templates/header.html:51
msgid "search"
msgstr ""
@@ -1839,7 +1728,6 @@ msgid "last updated questions"
msgstr ""
#: templates/index.html:27 templates/questions.html:47
-#: templates/unanswered.html:21
msgid "newest"
msgstr ""
@@ -1864,27 +1752,23 @@ msgid "all questions"
msgstr ""
#: templates/index.html:48 templates/question_summary_list_roll.html:13
-#: templates/questions.html:79 templates/unanswered.html:38
-#: templates/users_questions.html:36
+#: templates/questions.html:79 templates/users_questions.html:36
msgid "answers"
msgstr ""
#: templates/index.html:80 templates/index.html.py:94
#: templates/questions.html:111 templates/questions.html.py:125
-#: templates/unanswered.html:70 templates/unanswered.html.py:84
msgid "Posted:"
msgstr ""
#: templates/index.html:83 templates/index.html.py:88
#: templates/questions.html:114 templates/questions.html.py:119
-#: templates/unanswered.html:73 templates/unanswered.html.py:78
msgid "Updated:"
msgstr ""
#: templates/index.html:105 templates/question.html:480
#: templates/question_summary_list_roll.html:52 templates/questions.html:136
-#: templates/tags.html:49 templates/unanswered.html:95
-#: templates/unanswered.html.py:122 templates/users_questions.html:52
+#: templates/tags.html:49 templates/users_questions.html:52
msgid "see questions tagged"
msgstr ""
@@ -1929,7 +1813,7 @@ msgstr ""
msgid "complete list of questions"
msgstr "list of all questions"
-#: templates/index.html:161 templates/authopenid/signup.html:18
+#: templates/index.html:161 templates/authopenid/signup.html:26
msgid "or"
msgstr ""
@@ -1958,6 +1842,14 @@ msgstr ""
msgid "Logout now"
msgstr "Logout Now"
+#: templates/notarobot.html:3
+msgid "Please prove that you are a Human Being"
+msgstr ""
+
+#: templates/notarobot.html:10
+msgid "I am a Human Being"
+msgstr ""
+
#: templates/pagesize.html:6
msgid "posts per page"
msgstr ""
@@ -2414,8 +2306,7 @@ msgstr ""
msgid "Found by title"
msgstr ""
-#: templates/questions.html:39 templates/unanswered.html:8
-#: templates/unanswered.html.py:19
+#: templates/questions.html:39
msgid "Unanswered questions"
msgstr ""
@@ -2423,7 +2314,7 @@ msgstr ""
msgid "All questions"
msgstr ""
-#: templates/questions.html:47 templates/unanswered.html:21
+#: templates/questions.html:47
msgid "most recently asked questions"
msgstr ""
@@ -2480,14 +2371,12 @@ msgid_plural ""
" "
msgstr[0] ""
"\n"
-"%(q_num)s
question "
-"containing %(searchtitle)s"
-"p>"
+"
%(q_num)s
question containing "
+"%(searchtitle)s
"
msgstr[1] ""
"\n"
-"%(q_num)s
questions "
-"containing %(searchtitle)s"
-"p>"
+"
%(q_num)s
questions containing "
+"%(searchtitle)s
"
#: templates/questions.html:177
#, python-format
@@ -2576,7 +2465,7 @@ msgstr ""
msgid "Most voted questions are shown first."
msgstr ""
-#: templates/questions.html:224 templates/unanswered.html:118
+#: templates/questions.html:224
msgid "Related tags"
msgstr "Tags"
@@ -2681,13 +2570,6 @@ msgstr ""
msgid "Nothing found"
msgstr ""
-#: templates/unanswered.html:114
-#, python-format
-msgid "have %(num_q)s unanswered questions"
-msgstr ""
-"%(num_q)s
questions without "
-"accepted answers"
-
#: templates/user_edit.html:6
msgid "Edit user profile"
msgstr ""
@@ -2709,6 +2591,10 @@ msgstr "gravatar"
msgid "Registered user"
msgstr ""
+#: templates/user_edit.html:43
+msgid "Screen Name"
+msgstr ""
+
#: templates/user_edit.html:86 templates/user_email_subscriptions.html:20
msgid "Update"
msgstr ""
@@ -3147,25 +3033,36 @@ msgstr ""
"retrieve your unique avatar image - gravatar."
-#: templates/authopenid/complete.html:40
+#: templates/authopenid/complete.html:38
+#, python-format
+msgid "register new Facebook connect account info, see %(gravatar_faq_url)s"
+msgstr ""
+"You are here for the first time with your "
+"Facebook login. 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 - "
+"gravatar.
"
+
+#: templates/authopenid/complete.html:42
msgid "This account already exists, please use another."
msgstr ""
-#: templates/authopenid/complete.html:55
+#: templates/authopenid/complete.html:57
msgid "Sorry, looks like we have some errors:"
msgstr ""
-#: templates/authopenid/complete.html:76
+#: templates/authopenid/complete.html:82
msgid "Screen name label"
msgstr "Screen Name (will be shown to others)"
-#: templates/authopenid/complete.html:83
+#: templates/authopenid/complete.html:89
msgid "Email address label"
msgstr ""
"Email Address (will not be shared with "
"anyone, must be valid)"
-#: templates/authopenid/complete.html:89 templates/authopenid/signup.html:15
+#: templates/authopenid/complete.html:95 templates/authopenid/signup.html:18
msgid "receive updates motivational blurb"
msgstr ""
"Receive forum updates by email - this will help our "
@@ -3174,31 +3071,31 @@ msgstr ""
"week - only when there is anything new.
If you like, please "
"adjust this now or any time later from your user account."
-#: templates/authopenid/complete.html:91
+#: templates/authopenid/complete.html:99
msgid "Tag filter tool will be your right panel, once you log in."
msgstr ""
-#: templates/authopenid/complete.html:92
+#: templates/authopenid/complete.html:100
msgid "create account"
msgstr "Signup"
-#: templates/authopenid/complete.html:101
+#: templates/authopenid/complete.html:109
msgid "Existing account"
msgstr ""
-#: templates/authopenid/complete.html:102
+#: templates/authopenid/complete.html:110
msgid "user name"
msgstr ""
-#: templates/authopenid/complete.html:103
+#: templates/authopenid/complete.html:111
msgid "password"
msgstr ""
-#: templates/authopenid/complete.html:108
+#: templates/authopenid/complete.html:118
msgid "Register"
msgstr ""
-#: templates/authopenid/complete.html:109 templates/authopenid/signin.html:140
+#: templates/authopenid/complete.html:119 templates/authopenid/signin.html:151
msgid "Forgot your password?"
msgstr ""
@@ -3292,7 +3189,10 @@ msgid "Traditional login information"
msgstr ""
#: templates/authopenid/external_legacy_login_info.html:12
-msgid "how to login with password through external login website"
+#, python-format
+msgid ""
+"how to login with password through external login website or use %"
+"(feedback_url)s"
msgstr ""
#: templates/authopenid/sendpw.html:4 templates/authopenid/sendpw.html.py:7
@@ -3397,14 +3297,14 @@ msgstr ""
"have to remember another one. CNPROG option requires your login name and "
"password entered here."
-#: templates/authopenid/signin.html:117
+#: templates/authopenid/signin.html:128
msgid "Enter your Provider user name"
msgstr ""
"Enter your Provider user name
(or "
"select another login method above)"
-#: templates/authopenid/signin.html:124
+#: templates/authopenid/signin.html:135
msgid ""
"Enter your OpenID "
"web address"
@@ -3413,55 +3313,55 @@ msgstr ""
"openid.net\">OpenID web address
(or choose "
"another login method above)"
-#: templates/authopenid/signin.html:126 templates/authopenid/signin.html:138
+#: templates/authopenid/signin.html:137 templates/authopenid/signin.html:149
msgid "Login"
msgstr ""
-#: templates/authopenid/signin.html:129
+#: templates/authopenid/signin.html:140
msgid "Enter your login name and password"
msgstr ""
"Enter your CNPROG login and password
(or select your OpenID provider above)"
-#: templates/authopenid/signin.html:133
+#: templates/authopenid/signin.html:144
msgid "Login name"
msgstr ""
-#: templates/authopenid/signin.html:135
+#: templates/authopenid/signin.html:146
msgid "Password"
msgstr ""
-#: templates/authopenid/signin.html:139
+#: templates/authopenid/signin.html:150
msgid "Create account"
msgstr ""
-#: templates/authopenid/signin.html:149
+#: templates/authopenid/signin.html:160
msgid "Why use OpenID?"
msgstr ""
-#: templates/authopenid/signin.html:152
+#: templates/authopenid/signin.html:163
msgid "with openid it is easier"
msgstr "With the OpenID you don't need to create new username and password."
-#: templates/authopenid/signin.html:155
+#: templates/authopenid/signin.html:166
msgid "reuse openid"
msgstr "You can safely re-use the same login for all OpenID-enabled websites."
-#: templates/authopenid/signin.html:158
+#: templates/authopenid/signin.html:169
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:161
+#: templates/authopenid/signin.html:172
msgid "openid is supported open standard"
msgstr "OpenID is based on an open standard, supported by many organizations."
-#: templates/authopenid/signin.html:166
+#: templates/authopenid/signin.html:177
msgid "Find out more"
msgstr ""
-#: templates/authopenid/signin.html:167
+#: templates/authopenid/signin.html:178
msgid "Get OpenID"
msgstr ""
@@ -3482,14 +3382,104 @@ msgstr ""
"simply reuse your external login (e.g. Gmail or AOL) without ever sharing "
"your login details with anyone and having to remember yet another password."
-#: templates/authopenid/signup.html:17
+#: templates/authopenid/signup.html:19
+msgid ""
+"Please select your preferred email update schedule for the following groups "
+"of questions:"
+msgstr ""
+
+#: templates/authopenid/signup.html:23
+msgid ""
+"Please read and type in the two words below to help us prevent automated "
+"account creation."
+msgstr ""
+
+#: templates/authopenid/signup.html:25
msgid "Create Account"
msgstr ""
-#: templates/authopenid/signup.html:19
+#: templates/authopenid/signup.html:27
msgid "return to OpenID login"
msgstr ""
+#: templates/fbconnect/xd_receiver.html:5
+#, python-format
+msgid "Connect to %(APP_SHORT_NAME)s with Facebook!"
+msgstr ""
+
+#: utils/forms.py:27
+msgid "this field is required"
+msgstr ""
+
+#: utils/forms.py:42
+msgid "choose a username"
+msgstr "Choose screen name"
+
+#: utils/forms.py:47
+msgid "user name is required"
+msgstr ""
+
+#: utils/forms.py:48
+msgid "sorry, this name is taken, please choose another"
+msgstr ""
+
+#: utils/forms.py:49
+msgid "sorry, this name is not allowed, please choose another"
+msgstr ""
+
+#: utils/forms.py:50
+msgid "sorry, there is no user with this name"
+msgstr ""
+
+#: utils/forms.py:51
+msgid "sorry, we have a serious error - user name is taken by several users"
+msgstr ""
+
+#: utils/forms.py:52
+msgid "user name can only consist of letters, empty space and underscore"
+msgstr ""
+
+#: utils/forms.py:100
+msgid "your email address"
+msgstr "Your email (never shared)"
+
+#: utils/forms.py:101
+msgid "email address is required"
+msgstr ""
+
+#: utils/forms.py:102
+msgid "please enter a valid email address"
+msgstr ""
+
+#: utils/forms.py:103
+msgid "this email is already used by someone else, please choose another"
+msgstr ""
+
+#: utils/forms.py:128
+msgid "choose password"
+msgstr "Password"
+
+#: utils/forms.py:129
+msgid "password is required"
+msgstr ""
+
+#: utils/forms.py:132
+msgid "retype password"
+msgstr "Password (please retype)"
+
+#: utils/forms.py:133
+msgid "please, retype your password"
+msgstr ""
+
+#: utils/forms.py:134
+msgid "sorry, entered passwords did not match, please try again"
+msgstr ""
+
+#~ msgid "have %(num_q)s unanswered questions"
+#~ msgstr ""
+#~ "%(num_q)s
questions without "
+#~ "accepted answers"
+
#~ msgid ""
#~ "\n"
#~ "\t\t\t\thave total %(q_num)s questions\n"
--
cgit v1.2.3-1-g7c22