diff options
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/en/LC_MESSAGES/django.mo | bin | 27289 -> 26871 bytes | |||
| -rw-r--r-- | locale/en/LC_MESSAGES/django.po | 1225 |
2 files changed, 778 insertions, 447 deletions
diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo Binary files differindex 385fe3c8..cc6d50e7 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 e8cf9ba3..3f1c187f 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-01 19:51-0500\n" +"POT-Creation-Date: 2010-03-27 11:18-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -16,19 +16,246 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: forum/auth.py:484 +#: django_authopenid/forms.py:71 django_authopenid/views.py:118 +msgid "i-names are not supported" +msgstr "" + +#: django_authopenid/forms.py:134 +msgid "Account with this name already exists on the forum" +msgstr "" + +#: django_authopenid/forms.py:135 +msgid "can't have two logins to the same account yet, sorry." +msgstr "" + +#: django_authopenid/forms.py:157 forum_modules/localauth/forms.py:59 +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 +msgid "Login failed." +msgstr "" + +#: django_authopenid/forms.py:164 forum_modules/localauth/forms.py:66 +msgid "Please enter username and password" +msgstr "" + +#: django_authopenid/forms.py:166 forum_modules/localauth/forms.py:68 +msgid "Please enter your password" +msgstr "" + +#: django_authopenid/forms.py:168 forum_modules/localauth/forms.py:70 +msgid "Please enter user name" +msgstr "" + +#: 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:229 forum/authentication/forms.py:60 +msgid "Current password" +msgstr "" + +#: django_authopenid/forms.py:240 forum/authentication/forms.py:71 +msgid "" +"Old password is incorrect. Please enter the correct " +"password." +msgstr "" + +#: django_authopenid/forms.py:305 +msgid "Your user name (<i>required</i>)" +msgstr "" + +#: django_authopenid/forms.py:320 +msgid "Incorrect username." +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 "" + +#: django_authopenid/urls.py:24 fbconnect/urls.py:13 fbconnect/urls.py:17 +msgid "newquestion/" +msgstr "" + +#: django_authopenid/urls.py:25 fbconnect/urls.py:14 fbconnect/urls.py:18 +msgid "newanswer/" +msgstr "" + +#: django_authopenid/urls.py:26 forum/urls.py:94 +msgid "signout/" +msgstr "" + +#: django_authopenid/urls.py:27 +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 +msgid "register/" +msgstr "" + +#: django_authopenid/urls.py:30 +msgid "signup/" +msgstr "" + +#: django_authopenid/urls.py:32 +msgid "sendpw/" +msgstr "" + +#: django_authopenid/urls.py:33 django_authopenid/urls.py:37 +msgid "password/" +msgstr "" + +#: django_authopenid/urls.py:33 +msgid "confirm/" +msgstr "" + +#: django_authopenid/urls.py:36 +msgid "account_settings" +msgstr "" + +#: 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:38 forum/urls.py:99 +msgid "validate/" +msgstr "" + +#: django_authopenid/urls.py:39 +msgid "change/" +msgstr "" + +#: django_authopenid/urls.py:40 +msgid "sendkey/" +msgstr "" + +#: django_authopenid/urls.py:41 +msgid "verify/" +msgstr "" + +#: django_authopenid/urls.py:42 +msgid "openid/" +msgstr "" + +#: django_authopenid/urls.py:43 forum/urls.py:52 forum/urls.py:56 +msgid "delete/" +msgstr "" + +#: 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:600 +msgid "Welcome email subject line" +msgstr "Welcome to the Q&A forum" + +#: django_authopenid/views.py:706 +msgid "Password changed." +msgstr "" + +#: django_authopenid/views.py:718 django_authopenid/views.py:724 +#, python-format +msgid "your email needs to be validated see %(details_url)s" +msgstr "" +"Your email needs to be validated. Please see details <a " +"id='validate_email_alert' href='%(details_url)s'>here</a>." + +#: django_authopenid/views.py:745 +msgid "Email verification subject line" +msgstr "Verification Email from Q&A forum" + +#: django_authopenid/views.py:836 +msgid "your email was not changed" +msgstr "" + +#: django_authopenid/views.py:884 django_authopenid/views.py:1042 +#, python-format +msgid "No OpenID %s found associated in our database" +msgstr "" + +#: django_authopenid/views.py:888 django_authopenid/views.py:1049 +#, python-format +msgid "The OpenID %s isn't associated to current user logged in" +msgstr "" + +#: django_authopenid/views.py:896 +msgid "Email Changed." +msgstr "" + +#: django_authopenid/views.py:974 +msgid "This OpenID is already associated with another account." +msgstr "" + +#: django_authopenid/views.py:979 +#, python-format +msgid "OpenID %s is now associated with your account." +msgstr "" + +#: django_authopenid/views.py:1052 +msgid "Account deleted." +msgstr "" + +#: django_authopenid/views.py:1104 +msgid "Request for new password" +msgstr "" + +#: django_authopenid/views.py:1118 +msgid "A new password and the activation link were sent to your email address." +msgstr "" + +#: django_authopenid/views.py:1150 +#, python-format +msgid "" +"Could not change password. Confirmation key '%s' is not " +"registered." +msgstr "" + +#: django_authopenid/views.py:1160 +msgid "" +"Can not change password. User don't exist anymore in our " +"database." +msgstr "" + +#: django_authopenid/views.py:1170 +#, python-format +msgid "Password changed for %s. You may now sign in." +msgstr "" + +#: forum/auth.py:505 msgid "Your question and all of it's answers have been deleted" msgstr "" -#: forum/auth.py:486 +#: forum/auth.py:507 msgid "Your question has been deleted" msgstr "" -#: forum/auth.py:489 +#: forum/auth.py:510 msgid "The question and all of it's answers have been deleted" msgstr "" -#: forum/auth.py:491 +#: forum/auth.py:512 msgid "The question has been deleted" msgstr "" @@ -45,7 +272,7 @@ msgid "too subjective and argumentative" msgstr "" #: forum/const.py:11 -msgid "is not an answer to the question" +msgid "not a real question" msgstr "" #: forum/const.py:12 @@ -53,15 +280,19 @@ msgid "the question is answered, right answer was accepted" msgstr "" #: forum/const.py:13 -msgid "problem is not reproducible or outdated" +msgid "question is not relevant or outdated" +msgstr "" + +#: forum/const.py:14 +msgid "question contains offensive or malicious remarks" msgstr "" #: forum/const.py:15 -msgid "question contains offensive inappropriate, or malicious remarks" +msgid "spam or advertising" msgstr "" #: forum/const.py:16 -msgid "spam or advertising" +msgid "too localized" msgstr "" #: forum/const.py:57 @@ -138,19 +369,19 @@ msgstr "" #: forum/const.py:78 msgid "question_answered" -msgstr "answer" +msgstr "answered question" #: forum/const.py:79 msgid "question_commented" -msgstr "question comment" +msgstr "commented question" #: forum/const.py:80 msgid "answer_commented" -msgstr "answer comment" +msgstr "" #: forum/const.py:81 msgid "answer_accepted" -msgstr "answer accepted" +msgstr "" #: forum/const.py:85 msgid "[closed]" @@ -160,7 +391,7 @@ msgstr "" msgid "[deleted]" msgstr "" -#: forum/const.py:87 forum/views/readers.py:564 forum/views/readers.py:583 +#: forum/const.py:87 forum/views/readers.py:565 forum/views/readers.py:584 msgid "initial version" msgstr "" @@ -207,35 +438,35 @@ msgstr "" msgid "question content must be > 10 characters" msgstr "" -#: forum/forms.py:53 forum/skins/default/templates/header.html:28 +#: forum/forms.py:52 forum/skins/default/templates/header.html:28 #: forum/skins/default/templates/header.html:56 msgid "tags" msgstr "" -#: forum/forms.py:55 +#: forum/forms.py:54 msgid "" "Tags are short keywords, with no spaces within. Up to five tags can be used." msgstr "" -#: forum/forms.py:62 forum/skins/default/templates/question_retag.html:39 +#: forum/forms.py:61 forum/skins/default/templates/question_retag.html:39 msgid "tags are required" msgstr "" -#: forum/forms.py:68 +#: forum/forms.py:67 msgid "please use 5 tags or less" msgstr "" -#: forum/forms.py:71 +#: forum/forms.py:70 msgid "tags must be shorter than 20 characters" msgstr "" -#: forum/forms.py:75 +#: forum/forms.py:74 msgid "" "please use following characters in tags: letters 'a-z', numbers, and " "characters '.-_#'" msgstr "" -#: forum/forms.py:85 +#: forum/forms.py:84 #: 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 @@ -244,35 +475,35 @@ msgstr "" msgid "community wiki" msgstr "" -#: forum/forms.py:86 +#: forum/forms.py:85 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:102 +#: forum/forms.py:101 msgid "update summary:" msgstr "" -#: forum/forms.py:103 +#: forum/forms.py:102 msgid "" "enter a brief summary of your revision (e.g. fixed spelling, grammar, " "improved style, this field is optional)" msgstr "" -#: forum/forms.py:106 +#: forum/forms.py:105 msgid "Automatically accept user's contributions for the email updates" msgstr "" -#: forum/forms.py:122 +#: forum/forms.py:121 msgid "Your name:" msgstr "" -#: forum/forms.py:123 +#: forum/forms.py:122 msgid "Email (not shared with anyone):" msgstr "" -#: forum/forms.py:124 +#: forum/forms.py:123 msgid "Your message:" msgstr "" @@ -317,44 +548,46 @@ msgstr "" msgid "Choose email tag filter" msgstr "" -#: forum/forms.py:269 -msgid "Current password" -msgstr "" - -#: forum/forms.py:280 -msgid "" -"Old password is incorrect. Please enter the correct " -"password." -msgstr "" - -#: forum/forms.py:285 forum/forms.py:286 +#: forum/forms.py:267 forum/forms.py:268 msgid "weekly" msgstr "" -#: forum/forms.py:285 forum/forms.py:286 +#: forum/forms.py:267 forum/forms.py:268 msgid "no email" msgstr "" -#: forum/forms.py:286 +#: forum/forms.py:268 msgid "daily" msgstr "" -#: forum/forms.py:301 +#: forum/forms.py:283 msgid "Asked by me" msgstr "" -#: forum/forms.py:304 +#: forum/forms.py:286 msgid "Answered by me" msgstr "" -#: forum/forms.py:307 +#: forum/forms.py:289 msgid "Individually selected" msgstr "" -#: forum/forms.py:310 +#: forum/forms.py:292 msgid "Entire forum (tag filtered)" msgstr "" +#: forum/forms.py:346 forum/authentication/forms.py:41 +msgid "okay, let's try!" +msgstr "" + +#: forum/forms.py:347 +msgid "no community email please, thanks" +msgstr "no askbot email please, thanks" + +#: forum/forms.py:350 forum/authentication/forms.py:45 +msgid "please choose one of the options above" +msgstr "" + #: forum/urls.py:28 msgid "upfiles/" msgstr "" @@ -426,11 +659,7 @@ msgstr "" msgid "command/" msgstr "" -#: forum/urls.py:52 forum/urls.py:56 -msgid "delete/" -msgstr "" - -#: forum/urls.py:60 forum/views/readers.py:435 +#: forum/urls.py:60 forum/views/readers.py:436 msgid "question/" msgstr "" @@ -491,48 +720,61 @@ 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:100 forum/urls.py:102 +#: 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 msgid "account/" msgstr "" -#: forum/urls.py:93 forum/urls.py:95 forum/urls.py:96 -msgid "signin/" +#: forum/urls.py:97 +msgid "done/" msgstr "" -#: forum/urls.py:94 -msgid "signout/" +#: forum/urls.py:100 forum/urls.py:101 +msgid "tempsignin/" msgstr "" -#: forum/urls.py:97 -msgid "done/" +#: forum/urls.py:102 +msgid "authsettings/" msgstr "" -#: forum/urls.py:98 forum_modules/localauth/urls.py:7 -msgid "register/" +#: forum/urls.py:103 forum/urls.py:104 +msgid "providers/" msgstr "" -#: forum/urls.py:100 -msgid "password/" +#: forum/urls.py:103 +msgid "remove/" msgstr "" -#: forum/authentication/forms.py:17 -msgid "okay, let's try!" +#: forum/urls.py:104 +msgid "add/" msgstr "" -#: forum/authentication/forms.py:18 -msgid "no OSQA community email please, thanks" +#: forum/authentication/forms.py:22 +msgid "Your account email" msgstr "" -#: forum/authentication/forms.py:21 -msgid "please choose one of the options above" +#: 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:156 +#: forum/authentication/forms.py:42 +msgid "no OSQA community email please, thanks" +msgstr "" + +#: forum/management/commands/send_email_alerts.py:236 msgid "email update message subject" msgstr "news from Q&A forum" -#: forum/management/commands/send_email_alerts.py:158 +#: forum/management/commands/send_email_alerts.py:238 #, 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" @@ -543,24 +785,38 @@ msgstr[1] "" "<p>Dear %(name)s,</p><p>The following %(num)d questions have been updated on " "the Q&A forum:</p>" -#: forum/management/commands/send_email_alerts.py:169 +#: forum/management/commands/send_email_alerts.py:255 msgid "new question" msgstr "" -#: forum/management/commands/send_email_alerts.py:179 -#, python-format -msgid "There is also one question which was recently " -msgid_plural "" -"There are also %(num)d more questions which were recently updated " -msgstr[0] "" -msgstr[1] "" +#: forum/management/commands/send_email_alerts.py:272 +msgid "" +"Please visit the forum and see what's new! Could you spread the word about " +"it - can somebody you know help answering those questions or benefit from " +"posting one?" +msgstr "" + +#: forum/management/commands/send_email_alerts.py:284 +msgid "" +"Your most frequent subscription setting is 'daily' on selected questions. If " +"you are receiving more than one email per dayplease tell about this issue to " +"the forum administrator." +msgstr "" + +#: forum/management/commands/send_email_alerts.py:290 +msgid "" +"Your most frequent subscription setting is 'weekly' if you are receiving " +"this email more than once a week please report this issue to the forum " +"administrator." +msgstr "" -#: forum/management/commands/send_email_alerts.py:184 +#: forum/management/commands/send_email_alerts.py:296 msgid "" -"Perhaps you could look up previously sent forum reminders in your mailbox." +"There is a chance that you may be receiving links seen before - due to a " +"technicality that will eventually go away. " msgstr "" -#: forum/management/commands/send_email_alerts.py:188 +#: forum/management/commands/send_email_alerts.py:311 #, python-format msgid "" "go to %(link)s to change frequency of email updates or %(email)s " @@ -577,27 +833,27 @@ msgstr "" msgid "First time here? Check out the <a href=\"%s\">FAQ</a>!" msgstr "" -#: forum/models/question.py:247 +#: forum/models/question.py:362 #, python-format msgid "%(author)s modified the question" msgstr "" -#: forum/models/question.py:251 +#: forum/models/question.py:366 #, python-format msgid "%(people)s posted %(new_answer_count)s new answers" msgstr "" -#: forum/models/question.py:256 +#: forum/models/question.py:371 #, python-format msgid "%(people)s commented the question" msgstr "" -#: forum/models/question.py:261 +#: forum/models/question.py:376 #, python-format msgid "%(people)s commented answers" msgstr "" -#: forum/models/question.py:263 +#: forum/models/question.py:378 #, python-format msgid "%(people)s commented an answer" msgstr "" @@ -622,31 +878,31 @@ msgstr "" msgid "ignored" msgstr "" -#: forum/models/user.py:33 +#: forum/models/user.py:36 msgid "Entire forum" msgstr "" -#: forum/models/user.py:34 +#: forum/models/user.py:37 msgid "Questions that I asked" msgstr "" -#: forum/models/user.py:35 +#: forum/models/user.py:38 msgid "Questions that I answered" msgstr "" -#: forum/models/user.py:36 +#: forum/models/user.py:39 msgid "Individually selected questions" msgstr "" -#: forum/models/user.py:39 +#: forum/models/user.py:42 msgid "Weekly" msgstr "" -#: forum/models/user.py:40 +#: forum/models/user.py:43 msgid "Daily" msgstr "" -#: forum/models/user.py:41 +#: forum/models/user.py:44 msgid "No email" msgstr "" @@ -724,8 +980,7 @@ msgid "Account functions" msgstr "" #: forum/skins/default/templates/account_settings.html:29 -#: forum/skins/default/templates/changepw.html:5 -#: forum/skins/default/templates/changepw.html:14 +#: 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 @@ -779,8 +1034,8 @@ msgstr "" #: forum/skins/default/templates/answer_edit.html:28 #: forum/skins/default/templates/ask.html:26 #: forum/skins/default/templates/ask.html:29 -#: forum/skins/default/templates/question.html:45 -#: forum/skins/default/templates/question.html:48 +#: forum/skins/default/templates/question.html:46 +#: forum/skins/default/templates/question.html:49 #: forum/skins/default/templates/question_edit.html:25 #: forum/skins/default/templates/question_edit.html:28 msgid "hide preview" @@ -788,7 +1043,7 @@ msgstr "" #: forum/skins/default/templates/answer_edit.html:28 #: forum/skins/default/templates/ask.html:29 -#: forum/skins/default/templates/question.html:48 +#: forum/skins/default/templates/question.html:49 #: forum/skins/default/templates/question_edit.html:28 msgid "show preview" msgstr "" @@ -815,14 +1070,14 @@ msgstr "" #: forum/skins/default/templates/answer_edit.html:63 #: forum/skins/default/templates/ask.html:97 -#: forum/skins/default/templates/question.html:432 +#: forum/skins/default/templates/question.html:431 #: forum/skins/default/templates/question_edit.html:92 msgid "Toggle the real time Markdown editor preview" msgstr "" #: forum/skins/default/templates/answer_edit.html:63 #: forum/skins/default/templates/ask.html:97 -#: forum/skins/default/templates/question.html:433 +#: forum/skins/default/templates/question.html:432 #: forum/skins/default/templates/question_edit.html:92 msgid "toggle preview" msgstr "" @@ -1090,8 +1345,8 @@ msgid "number of times" msgstr "" #: forum/skins/default/templates/book.html:105 -#: forum/skins/default/templates/index.html:40 #: forum/skins/default/templates/index_.html:40 +#: 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 @@ -1103,8 +1358,8 @@ msgid "the answer has been accepted to be correct" msgstr "" #: forum/skins/default/templates/book.html:115 -#: forum/skins/default/templates/index.html:48 #: forum/skins/default/templates/index_.html:48 +#: 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 @@ -1112,9 +1367,9 @@ msgid "views" msgstr "" #: forum/skins/default/templates/book.html:125 -#: forum/skins/default/templates/index.html:63 #: forum/skins/default/templates/index_.html:63 #: forum/skins/default/templates/question.html:478 +#: forum/skins/default/templates/question_list.html:36 #: forum/skins/default/templates/question_summary_list_roll.html:52 #: forum/skins/default/templates/questions.html:136 #: forum/skins/default/templates/tags.html:49 @@ -1127,23 +1382,11 @@ msgid "subscribe to book RSS feed" msgstr "" #: forum/skins/default/templates/book.html:147 -#: forum/skins/default/templates/index.html:114 +#: forum/skins/default/templates/index.html:85 #: forum/skins/default/templates/index_.html:114 msgid "subscribe to the questions feed" msgstr "" -#: forum/skins/default/templates/changepw.html:7 -#: forum/skins/default/templates/authopenid/changepw.html:7 -msgid "Account: change password" -msgstr "Change your password" - -#: forum/skins/default/templates/changepw.html:8 -#: 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/close.html:6 #: forum/skins/default/templates/close.html:16 msgid "Close question" @@ -1161,6 +1404,10 @@ msgstr "" msgid "OK to close" msgstr "" +#: forum/skins/default/templates/email_base.html:11 +msgid "home" +msgstr "" + #: forum/skins/default/templates/faq.html:11 msgid "Frequently Asked Questions " msgstr "" @@ -1387,7 +1634,7 @@ msgid "questions" msgstr "" #: forum/skins/default/templates/faq.html:130 -#: forum/skins/default/templates/index.html:121 +#: forum/skins/default/templates/index.html:92 #: forum/skins/default/templates/index_.html:121 msgid "." msgstr "" @@ -1453,14 +1700,14 @@ msgstr "" #: forum/skins/default/templates/footer.html:8 #: forum/skins/default/templates/header.html:13 -#: forum/skins/default/templates/index.html:77 +#: forum/skins/default/templates/index.html:44 #: forum/skins/default/templates/index_.html:77 msgid "about" msgstr "" #: forum/skins/default/templates/footer.html:9 #: forum/skins/default/templates/header.html:14 -#: forum/skins/default/templates/index.html:78 +#: forum/skins/default/templates/index.html:45 #: forum/skins/default/templates/index_.html:78 #: forum/skins/default/templates/question_edit_tips.html:17 msgid "faq" @@ -1496,7 +1743,7 @@ msgid "books" msgstr "" #: forum/skins/default/templates/header.html:33 -#: forum/templatetags/extra_tags.py:165 forum/templatetags/extra_tags.py:194 +#: forum/templatetags/extra_tags.py:166 forum/templatetags/extra_tags.py:195 msgid "badges" msgstr "" @@ -1512,151 +1759,147 @@ msgstr "" msgid "search" msgstr "" -#: forum/skins/default/templates/index.html:8 +#: forum/skins/default/templates/index.html:9 #: forum/skins/default/templates/index_.html:8 msgid "Home" msgstr "" -#: forum/skins/default/templates/index.html:25 +#: forum/skins/default/templates/index.html:26 #: forum/skins/default/templates/index_.html:25 #: forum/skins/default/templates/questions.html:8 msgid "Questions" msgstr "" -#: forum/skins/default/templates/index.html:27 +#: forum/skins/default/templates/index.html:28 #: forum/skins/default/templates/index_.html:27 msgid "last updated questions" msgstr "" -#: forum/skins/default/templates/index.html:27 +#: forum/skins/default/templates/index.html:28 #: forum/skins/default/templates/index_.html:27 #: forum/skins/default/templates/questions.html:47 msgid "newest" msgstr "" -#: forum/skins/default/templates/index.html:28 +#: forum/skins/default/templates/index.html:29 #: forum/skins/default/templates/index_.html:28 #: forum/skins/default/templates/questions.html:49 msgid "hottest questions" msgstr "" -#: forum/skins/default/templates/index.html:28 +#: forum/skins/default/templates/index.html:29 #: forum/skins/default/templates/index_.html:28 #: forum/skins/default/templates/questions.html:49 msgid "hottest" msgstr "" -#: forum/skins/default/templates/index.html:29 +#: forum/skins/default/templates/index.html:30 #: forum/skins/default/templates/index_.html:29 #: forum/skins/default/templates/questions.html:50 msgid "most voted questions" msgstr "" -#: forum/skins/default/templates/index.html:29 +#: forum/skins/default/templates/index.html:30 #: forum/skins/default/templates/index_.html:29 #: forum/skins/default/templates/questions.html:50 msgid "most voted" msgstr "" -#: forum/skins/default/templates/index.html:30 +#: forum/skins/default/templates/index.html:31 #: forum/skins/default/templates/index_.html:30 msgid "all questions" msgstr "" -#: forum/skins/default/templates/index.html:42 -#: forum/skins/default/templates/index_.html:42 -#: forum/skins/default/templates/users_questions.html:34 -msgid "this answer has been accepted to be correct" -msgstr "" - -#: forum/skins/default/templates/index.html:44 -#: forum/skins/default/templates/index_.html:44 -#: 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 -msgid "answers" -msgstr "" - -#: forum/skins/default/templates/index.html:63 -#: forum/skins/default/templates/index_.html:63 -#: forum/skins/default/templates/question.html:478 -#: 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 -msgid "see questions tagged" -msgstr "" - -#: forum/skins/default/templates/index.html:74 +#: forum/skins/default/templates/index.html:41 #: forum/skins/default/templates/index_.html:74 msgid "welcome to website" msgstr "Welcome to Q&A forum" -#: forum/skins/default/templates/index.html:85 +#: forum/skins/default/templates/index.html:52 #: forum/skins/default/templates/index_.html:85 msgid "Recent tags" msgstr "" -#: forum/skins/default/templates/index.html:90 +#: forum/skins/default/templates/index.html:58 #: forum/skins/default/templates/index_.html:90 -#: forum/skins/default/templates/question.html:133 +#: forum/skins/default/templates/question.html:134 #, python-format msgid "see questions tagged '%(tagname)s'" msgstr "" -#: forum/skins/default/templates/index.html:93 -#: forum/skins/default/templates/index.html:121 +#: forum/skins/default/templates/index.html:62 +#: forum/skins/default/templates/index.html:92 #: forum/skins/default/templates/index_.html:93 #: forum/skins/default/templates/index_.html:121 msgid "popular tags" msgstr "tags" -#: forum/skins/default/templates/index.html:98 +#: forum/skins/default/templates/index.html:67 #: forum/skins/default/templates/index_.html:98 msgid "Recent awards" msgstr "Recent badges" -#: forum/skins/default/templates/index.html:104 -msgid "given to" -msgstr "" - -#: forum/skins/default/templates/index.html:109 +#: forum/skins/default/templates/index.html:80 #: forum/skins/default/templates/index_.html:109 msgid "all awards" msgstr "all badges" -#: forum/skins/default/templates/index.html:114 +#: forum/skins/default/templates/index.html:85 #: forum/skins/default/templates/index_.html:114 msgid "subscribe to last 30 questions by RSS" msgstr "" -#: forum/skins/default/templates/index.html:121 +#: forum/skins/default/templates/index.html:92 #: forum/skins/default/templates/index_.html:121 msgid "Still looking for more? See" msgstr "" -#: forum/skins/default/templates/index.html:121 +#: forum/skins/default/templates/index.html:92 #: forum/skins/default/templates/index_.html:121 msgid "complete list of questions" msgstr "list of all questions" -#: forum/skins/default/templates/index.html:121 +#: 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 "" -#: forum/skins/default/templates/index.html:121 +#: forum/skins/default/templates/index.html:92 #: forum/skins/default/templates/index_.html:121 msgid "Please help us answer" msgstr "" -#: forum/skins/default/templates/index.html:121 +#: forum/skins/default/templates/index.html:92 #: forum/skins/default/templates/index_.html:121 msgid "list of unanswered questions" 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 +msgid "this answer has been accepted to be correct" +msgstr "" + +#: forum/skins/default/templates/index_.html:44 +#: 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 +msgid "answers" +msgstr "" + +#: forum/skins/default/templates/index_.html:63 +#: forum/skins/default/templates/question.html:478 +#: forum/skins/default/templates/question_list.html:36 +#: 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 +msgid "see questions tagged" +msgstr "" + #: forum/skins/default/templates/logout.html:6 #: forum/skins/default/templates/logout.html:16 msgid "Logout" @@ -1801,78 +2044,78 @@ msgstr "" "Whenever such changes occur, users will be notified via the internal " "messaging system. " -#: forum/skins/default/templates/question.html:77 #: forum/skins/default/templates/question.html:78 -#: forum/skins/default/templates/question.html:94 -#: forum/skins/default/templates/question.html:96 +#: forum/skins/default/templates/question.html:79 +#: forum/skins/default/templates/question.html:95 +#: forum/skins/default/templates/question.html:97 msgid "i like this post (click again to cancel)" msgstr "" -#: forum/skins/default/templates/question.html:80 -#: forum/skins/default/templates/question.html:98 -#: forum/skins/default/templates/question.html:255 +#: forum/skins/default/templates/question.html:81 +#: forum/skins/default/templates/question.html:99 +#: forum/skins/default/templates/question.html:256 msgid "current number of votes" msgstr "" -#: forum/skins/default/templates/question.html:89 #: forum/skins/default/templates/question.html:90 -#: forum/skins/default/templates/question.html:103 +#: forum/skins/default/templates/question.html:91 #: forum/skins/default/templates/question.html:104 +#: forum/skins/default/templates/question.html:105 msgid "i dont like this post (click again to cancel)" msgstr "" -#: forum/skins/default/templates/question.html:108 #: forum/skins/default/templates/question.html:109 +#: forum/skins/default/templates/question.html:110 msgid "mark this question as favorite (click again to cancel)" msgstr "" -#: forum/skins/default/templates/question.html:115 #: forum/skins/default/templates/question.html:116 +#: forum/skins/default/templates/question.html:117 msgid "remove favorite mark from this question (click again to restore mark)" msgstr "" -#: forum/skins/default/templates/question.html:138 -#: forum/skins/default/templates/question.html:292 +#: forum/skins/default/templates/question.html:139 +#: forum/skins/default/templates/question.html:293 #: forum/skins/default/templates/revisions_answer.html:58 #: forum/skins/default/templates/revisions_question.html:58 msgid "edit" msgstr "" -#: forum/skins/default/templates/question.html:143 +#: forum/skins/default/templates/question.html:144 msgid "reopen" msgstr "" -#: forum/skins/default/templates/question.html:147 +#: forum/skins/default/templates/question.html:148 msgid "close" msgstr "" -#: forum/skins/default/templates/question.html:153 -#: forum/skins/default/templates/question.html:297 +#: forum/skins/default/templates/question.html:154 +#: forum/skins/default/templates/question.html:298 msgid "" "report as offensive (i.e containing spam, advertising, malicious text, etc.)" msgstr "" -#: forum/skins/default/templates/question.html:154 -#: forum/skins/default/templates/question.html:298 +#: forum/skins/default/templates/question.html:155 +#: forum/skins/default/templates/question.html:299 msgid "flag offensive" msgstr "" -#: forum/skins/default/templates/question.html:162 -#: forum/skins/default/templates/question.html:309 +#: forum/skins/default/templates/question.html:163 +#: forum/skins/default/templates/question.html:310 msgid "delete" msgstr "" -#: forum/skins/default/templates/question.html:180 -#: forum/skins/default/templates/question.html:329 +#: forum/skins/default/templates/question.html:181 +#: forum/skins/default/templates/question.html:330 msgid "delete this comment" msgstr "" -#: forum/skins/default/templates/question.html:191 -#: forum/skins/default/templates/question.html:340 +#: forum/skins/default/templates/question.html:192 +#: forum/skins/default/templates/question.html:341 msgid "add comment" msgstr "post a comment" -#: forum/skins/default/templates/question.html:195 +#: forum/skins/default/templates/question.html:196 #, python-format msgid "" "\n" @@ -1886,7 +2129,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: forum/skins/default/templates/question.html:201 +#: forum/skins/default/templates/question.html:202 #, python-format msgid "" "\n" @@ -1901,18 +2144,18 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: forum/skins/default/templates/question.html:217 +#: forum/skins/default/templates/question.html:218 #, python-format msgid "" "The question has been closed for the following reason \"%(close_reason)s\" by" msgstr "" -#: forum/skins/default/templates/question.html:219 +#: forum/skins/default/templates/question.html:220 #, python-format msgid "close date %(closed_at)s" msgstr "" -#: forum/skins/default/templates/question.html:227 +#: forum/skins/default/templates/question.html:228 #, python-format msgid "" "\n" @@ -1925,63 +2168,63 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: forum/skins/default/templates/question.html:235 +#: forum/skins/default/templates/question.html:236 msgid "oldest answers will be shown first" msgstr "" -#: forum/skins/default/templates/question.html:235 +#: forum/skins/default/templates/question.html:236 msgid "oldest answers" msgstr "oldest" -#: forum/skins/default/templates/question.html:237 +#: forum/skins/default/templates/question.html:238 msgid "newest answers will be shown first" msgstr "" -#: forum/skins/default/templates/question.html:237 +#: forum/skins/default/templates/question.html:238 msgid "newest answers" msgstr "newest" -#: forum/skins/default/templates/question.html:239 +#: forum/skins/default/templates/question.html:240 msgid "most voted answers will be shown first" msgstr "" -#: forum/skins/default/templates/question.html:239 +#: forum/skins/default/templates/question.html:240 msgid "popular answers" msgstr "most voted" -#: forum/skins/default/templates/question.html:253 #: forum/skins/default/templates/question.html:254 +#: forum/skins/default/templates/question.html:255 msgid "i like this answer (click again to cancel)" msgstr "" -#: forum/skins/default/templates/question.html:260 #: forum/skins/default/templates/question.html:261 +#: forum/skins/default/templates/question.html:262 msgid "i dont like this answer (click again to cancel)" msgstr "" -#: forum/skins/default/templates/question.html:266 #: forum/skins/default/templates/question.html:267 +#: forum/skins/default/templates/question.html:268 msgid "mark this answer as favorite (click again to undo)" msgstr "" -#: forum/skins/default/templates/question.html:272 #: forum/skins/default/templates/question.html:273 +#: forum/skins/default/templates/question.html:274 msgid "the author of the question has selected this answer as correct" msgstr "" -#: forum/skins/default/templates/question.html:286 +#: forum/skins/default/templates/question.html:287 msgid "answer permanent link" msgstr "" -#: forum/skins/default/templates/question.html:287 +#: forum/skins/default/templates/question.html:288 msgid "permanent link" msgstr "link" -#: forum/skins/default/templates/question.html:309 +#: forum/skins/default/templates/question.html:310 msgid "undelete" msgstr "" -#: forum/skins/default/templates/question.html:344 +#: forum/skins/default/templates/question.html:345 #, python-format msgid "" "\n" @@ -1996,7 +2239,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: forum/skins/default/templates/question.html:350 +#: forum/skins/default/templates/question.html:351 #, python-format msgid "" "\n" @@ -2011,45 +2254,41 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: forum/skins/default/templates/question.html:376 -#: forum/skins/default/templates/question.html:379 +#: forum/skins/default/templates/question.html:377 +#: forum/skins/default/templates/question.html:380 msgid "Notify me once a day when there are any new answers" msgstr "" "<strong>Notify me</strong> once a day by email when there are any new " "answers or updates" -#: forum/skins/default/templates/question.html:382 +#: forum/skins/default/templates/question.html:383 msgid "Notify me weekly when there are any new answers" msgstr "" "<strong>Notify me</strong> weekly when there are any new answers or updates" -#: forum/skins/default/templates/question.html:387 +#: forum/skins/default/templates/question.html:388 #, python-format msgid "" -"\n" -" You can always adjust frequency of email updates from your %" -"(profile_url)s\n" -" " +"You can always adjust frequency of email updates from your %(profile_url)s" msgstr "" -"\n" -"(note: you can always <a href='%(profile_url)s?" -"sort=email_subscriptions'>adjust frequency</a> of email updates)" +"(note: you can always <strong><a href='%(profile_url)s?" +"sort=email_subscriptions'>change</a></strong> how often you receive updates)" -#: forum/skins/default/templates/question.html:394 +#: forum/skins/default/templates/question.html:393 msgid "once you sign in you will be able to subscribe for any updates here" msgstr "" "<span class='strong'>Here</span> (once you log in) you will be able to sign " "up for the periodic email updates about this question." -#: forum/skins/default/templates/question.html:405 +#: forum/skins/default/templates/question.html:404 msgid "Your answer" msgstr "" -#: forum/skins/default/templates/question.html:407 +#: forum/skins/default/templates/question.html:406 msgid "Be the first one to answer this question!" msgstr "" -#: forum/skins/default/templates/question.html:413 +#: forum/skins/default/templates/question.html:412 msgid "you can answer anonymously and then login" msgstr "" "<span class='strong big'>Please start posting your answer anonymously</span> " @@ -2058,7 +2297,7 @@ msgstr "" "answer</strong>, for discussions, <strong>please use comments</strong> and " "<strong>please do remember to vote</strong> (after you log in)!" -#: forum/skins/default/templates/question.html:417 +#: forum/skins/default/templates/question.html:416 msgid "answer your own question only to give an answer" msgstr "" "<span class='big strong'>You are welcome to answer your own question</span>, " @@ -2068,7 +2307,7 @@ msgstr "" "forget to vote :)</strong> for the answers that you liked (or perhaps did " "not like)! " -#: forum/skins/default/templates/question.html:419 +#: forum/skins/default/templates/question.html:418 msgid "please only give an answer, no discussions" msgstr "" "<span class='big strong'>Please try to give a substantial answer</span>. If " @@ -2078,15 +2317,15 @@ msgstr "" "please <strong>don't forget to vote</strong> - it really helps to select the " "best questions and answers!" -#: forum/skins/default/templates/question.html:455 +#: forum/skins/default/templates/question.html:454 msgid "Login/Signup to Post Your Answer" msgstr "" -#: forum/skins/default/templates/question.html:458 +#: forum/skins/default/templates/question.html:457 msgid "Answer Your Own Question" msgstr "" -#: forum/skins/default/templates/question.html:460 +#: forum/skins/default/templates/question.html:459 msgid "Answer the question" msgstr "Post Your Answer" @@ -2110,7 +2349,7 @@ msgstr "" msgid "last updated" msgstr "Last updated" -#: forum/skins/default/templates/question.html:494 +#: forum/skins/default/templates/question.html:495 msgid "Related questions" msgstr "" @@ -2125,7 +2364,7 @@ msgstr "Tips" #: forum/skins/default/templates/question_edit_tips.html:7 msgid "please ask a relevant question" -msgstr "ask a question relevant to the CNPROG community" +msgstr "ask a question interesting to this community" #: forum/skins/default/templates/question_edit_tips.html:10 msgid "please try provide enough details" @@ -2208,136 +2447,92 @@ msgstr "" #: forum/skins/default/templates/questions.html:163 #, python-format -msgid "" -"\n" -" have total %(q_num)s questions tagged %(tagname)s\n" -" " -msgid_plural "" -"\n" -" have total %(q_num)s questions tagged %(tagname)s\n" -" " +msgid "have total %(q_num)s questions tagged %(tagname)s" +msgid_plural "have total %(q_num)s questions tagged %(tagname)s" 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>" -#: forum/skins/default/templates/questions.html:171 +#: forum/skins/default/templates/questions.html:167 #, python-format msgid "" -"\n" -" have total %(q_num)s questions containing %(searchtitle)" -"s in full text\n" -" " +" have total %(q_num)s questions containing %(searchtitle)s in full text " msgid_plural "" -"\n" -" have total %(q_num)s questions containing %(searchtitle)" -"s in full text\n" -" " +" have total %(q_num)s questions containing %(searchtitle)s in full text " msgstr[0] "" -"\n" "<div class=\"questions-count\">%(q_num)s</div><p>question containing " "<strong><span class=\"darkred\">%(searchtitle)s</span></strong></p>" msgstr[1] "" -"\n" "<div class=\"questions-count\">%(q_num)s</div><p>questions containing " "<strong><span class=\"darkred\">%(searchtitle)s</span></strong></p>" -#: forum/skins/default/templates/questions.html:177 +#: forum/skins/default/templates/questions.html:169 #, python-format -msgid "" -"\n" -" have total %(q_num)s questions containing %(searchtitle)" -"s\n" -" " -msgid_plural "" -"\n" -" have total %(q_num)s questions containing %(searchtitle)" -"s\n" -" " +msgid " have total %(q_num)s questions containing %(searchtitle)s " +msgid_plural " have total %(q_num)s questions containing %(searchtitle)s " 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>" -#: forum/skins/default/templates/questions.html:185 +#: forum/skins/default/templates/questions.html:173 #, python-format -msgid "" -"\n" -" have total %(q_num)s unanswered questions\n" -" " -msgid_plural "" -"\n" -" have total %(q_num)s unanswered questions\n" -" " +msgid " have total %(q_num)s unanswered questions " +msgid_plural " have total %(q_num)s unanswered questions " msgstr[0] "" -"\n" -"<div class=\"questions-count\">%(q_num)s</div><p>question without an " -"accepted answer</p>" +"<div class=\"questions-count\">%(q_num)s</div>questions <strong>without " +"accepted answers</strong>" msgstr[1] "" -"\n" -"<div class=\"questions-count\">%(q_num)s</div><p>questions without an " -"accepted answer</p>" +"<div class=\"questions-count\">%(q_num)s</div>questions <strong>without " +"accepted answers</strong>" -#: forum/skins/default/templates/questions.html:191 +#: forum/skins/default/templates/questions.html:175 #, python-format -msgid "" -"\n" -" have total %(q_num)s question\n" -" " -msgid_plural "" -"\n" -" have total %(q_num)s questions\n" -" " -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>" +msgid " have total %(q_num)s questions " +msgid_plural " have total %(q_num)s questions " +msgstr[0] "<div class=\"questions-count\">%(q_num)s</div><p>question</p>" +msgstr[1] "<div class=\"questions-count\">%(q_num)s</div><p>questions</p>" -#: forum/skins/default/templates/questions.html:201 +#: forum/skins/default/templates/questions.html:181 msgid "latest questions info" msgstr "<strong>Newest</strong> questions are shown first." -#: forum/skins/default/templates/questions.html:205 +#: forum/skins/default/templates/questions.html:185 msgid "Questions are sorted by the <strong>time of last update</strong>." msgstr "" -#: forum/skins/default/templates/questions.html:206 +#: forum/skins/default/templates/questions.html:186 msgid "Most recently answered ones are shown first." msgstr "<strong>Most recently answered</strong> questions are shown first." -#: forum/skins/default/templates/questions.html:210 +#: forum/skins/default/templates/questions.html:190 msgid "Questions sorted by <strong>number of responses</strong>." msgstr "Questions sorted by the <strong>number of answers</strong>." -#: forum/skins/default/templates/questions.html:211 +#: forum/skins/default/templates/questions.html:191 msgid "Most answered questions are shown first." msgstr " " -#: forum/skins/default/templates/questions.html:215 +#: forum/skins/default/templates/questions.html:195 msgid "Questions are sorted by the <strong>number of votes</strong>." msgstr "" -#: forum/skins/default/templates/questions.html:216 +#: forum/skins/default/templates/questions.html:196 msgid "Most voted questions are shown first." msgstr "" -#: forum/skins/default/templates/questions.html:224 +#: forum/skins/default/templates/questions.html:204 msgid "Related tags" msgstr "Tags" -#: forum/skins/default/templates/questions.html:227 +#: forum/skins/default/templates/questions.html:207 #: forum/skins/default/templates/tag_selector.html:10 #: forum/skins/default/templates/tag_selector.html:27 #, python-format @@ -2409,7 +2604,7 @@ msgid "remove '%(tag_name)s' from the list of ignored tags" msgstr "" #: forum/skins/default/templates/tag_selector.html:40 -msgid "keep ingored questions hidden" +msgid "keep ignored questions hidden" msgstr "" #: forum/skins/default/templates/tags.html:6 @@ -2463,7 +2658,7 @@ 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:60 +#: forum/skins/default/templates/user_info.html:56 msgid "Registered user" msgstr "" @@ -2506,39 +2701,39 @@ msgstr "" msgid "update profile" msgstr "" -#: forum/skins/default/templates/user_info.html:64 +#: forum/skins/default/templates/user_info.html:60 msgid "real name" msgstr "" -#: forum/skins/default/templates/user_info.html:69 +#: forum/skins/default/templates/user_info.html:65 msgid "member for" msgstr "member since" -#: forum/skins/default/templates/user_info.html:74 +#: forum/skins/default/templates/user_info.html:70 msgid "last seen" msgstr "" -#: forum/skins/default/templates/user_info.html:80 +#: forum/skins/default/templates/user_info.html:76 msgid "user website" msgstr "" -#: forum/skins/default/templates/user_info.html:86 +#: forum/skins/default/templates/user_info.html:82 msgid "location" msgstr "" -#: forum/skins/default/templates/user_info.html:93 +#: forum/skins/default/templates/user_info.html:89 msgid "age" msgstr "" -#: forum/skins/default/templates/user_info.html:94 +#: forum/skins/default/templates/user_info.html:90 msgid "age unit" msgstr "years old" -#: forum/skins/default/templates/user_info.html:100 +#: forum/skins/default/templates/user_info.html:96 msgid "todays unused votes" msgstr "" -#: forum/skins/default/templates/user_info.html:101 +#: forum/skins/default/templates/user_info.html:97 msgid "votes left" msgstr "" @@ -2745,6 +2940,48 @@ 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" @@ -2839,10 +3076,43 @@ msgstr "" #: forum/skins/default/templates/auth/complete.html:87 #: forum/skins/default/templates/authopenid/complete.html:122 -#: forum/skins/default/templates/authopenid/signin.html:151 +#: 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 @@ -2857,53 +3127,65 @@ msgstr "" "</span></p><p><font color=\"gray\">External login services use <a href=" "\"http://openid.net\"><b>OpenID</b></a> technology, where your password " "always stays confidential between you and your login provider and you don't " -"have to remember another one. CNPROG option requires your login name and " -"password entered here.</font></p>" +"have to remember another one.</font></p>" #: forum/skins/default/templates/auth/signin.html:34 msgid "" -"Take the opurtunity to validate my email next to the external provider I " +"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:140 -#: forum/skins/default/templates/authopenid/signin.html:160 +#: 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:143 -#: forum/skins/default/templates/authopenid/signin.html:163 +#: 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:146 -#: forum/skins/default/templates/authopenid/signin.html:166 +#: 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:149 -#: forum/skins/default/templates/authopenid/signin.html:169 +#: 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:152 -#: forum/skins/default/templates/authopenid/signin.html:172 +#: 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:157 -#: forum/skins/default/templates/authopenid/signin.html:177 +#: 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:158 -#: forum/skins/default/templates/authopenid/signin.html:178 +#: forum/skins/default/templates/auth/signin.html:162 +#: forum/skins/default/templates/authopenid/signin.html:192 msgid "Get OpenID" msgstr "" @@ -2943,6 +3225,38 @@ msgstr "" 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 @@ -3072,6 +3386,10 @@ msgstr "" msgid "OpenID URL:" msgstr "" +#: forum/skins/default/templates/authopenid/changepw.html:7 +msgid "Account: change password" +msgstr "Change your password" + #: forum/skins/default/templates/authopenid/complete.html:27 #, python-format msgid "register new %(provider)s account info, see %(gravatar_faq_url)s" @@ -3186,18 +3504,6 @@ 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" @@ -3282,14 +3588,23 @@ 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:128 +# 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. " +# "Askbot option requires your login name and " +# "password entered here.</font></p>" +#: forum/skins/default/templates/authopenid/signin.html:140 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:135 +#: forum/skins/default/templates/authopenid/signin.html:147 msgid "" "Enter your <a class=\"openid_logo\" href=\"http://openid.net\">OpenID</a> " "web address" @@ -3298,26 +3613,26 @@ 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:137 #: forum/skins/default/templates/authopenid/signin.html:149 +#: forum/skins/default/templates/authopenid/signin.html:162 msgid "Login" msgstr "" -#: forum/skins/default/templates/authopenid/signin.html:140 +#: forum/skins/default/templates/authopenid/signin.html:153 msgid "Enter your login name and password" msgstr "" -"<span class='big strong'>Enter your CNPROG login and password</span><br/" +"<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:144 +#: forum/skins/default/templates/authopenid/signin.html:157 msgid "Login name" msgstr "" -#: forum/skins/default/templates/authopenid/signin.html:146 +#: forum/skins/default/templates/authopenid/signin.html:159 msgid "Password" msgstr "" -#: forum/skins/default/templates/authopenid/signin.html:150 +#: forum/skins/default/templates/authopenid/signin.html:163 msgid "Create account" msgstr "" @@ -3330,126 +3645,167 @@ msgstr "" msgid "Connect to %(APP_SHORT_NAME)s with Facebook!" msgstr "" -#: forum/templatetags/extra_tags.py:166 forum/templatetags/extra_tags.py:193 +#: forum/templatetags/extra_tags.py:167 forum/templatetags/extra_tags.py:194 msgid "reputation points" msgstr "karma" -#: forum/templatetags/extra_tags.py:253 +#: forum/templatetags/extra_tags.py:254 msgid "2 days ago" msgstr "" -#: forum/templatetags/extra_tags.py:255 +#: forum/templatetags/extra_tags.py:256 msgid "yesterday" msgstr "" -#: forum/templatetags/extra_tags.py:257 +#: forum/templatetags/extra_tags.py:258 #, python-format msgid "%(hr)d hour ago" msgid_plural "%(hr)d hours ago" msgstr[0] "" msgstr[1] "" -#: forum/templatetags/extra_tags.py:259 +#: forum/templatetags/extra_tags.py:260 #, python-format msgid "%(min)d min ago" msgid_plural "%(min)d mins ago" msgstr[0] "" msgstr[1] "" -#: forum/utils/forms.py:27 +#: forum/utils/forms.py:30 msgid "this field is required" msgstr "" -#: forum/utils/forms.py:42 +#: forum/utils/forms.py:45 msgid "choose a username" msgstr "Choose screen name" -#: forum/utils/forms.py:47 +#: forum/utils/forms.py:50 msgid "user name is required" msgstr "" -#: forum/utils/forms.py:48 +#: forum/utils/forms.py:51 msgid "sorry, this name is taken, please choose another" msgstr "" -#: forum/utils/forms.py:49 +#: forum/utils/forms.py:52 msgid "sorry, this name is not allowed, please choose another" msgstr "" -#: forum/utils/forms.py:50 +#: forum/utils/forms.py:53 msgid "sorry, there is no user with this name" msgstr "" -#: forum/utils/forms.py:51 +#: forum/utils/forms.py:54 msgid "sorry, we have a serious error - user name is taken by several users" msgstr "" -#: forum/utils/forms.py:52 +#: forum/utils/forms.py:55 msgid "user name can only consist of letters, empty space and underscore" msgstr "" -#: forum/utils/forms.py:100 +#: forum/utils/forms.py:109 msgid "your email address" msgstr "Your email <i>(never shared)</i>" -#: forum/utils/forms.py:101 +#: forum/utils/forms.py:110 msgid "email address is required" msgstr "" -#: forum/utils/forms.py:102 -msgid "please enter a valid email address" -msgstr "" - -#: forum/utils/forms.py:103 +#: forum/utils/forms.py:112 msgid "this email is already used by someone else, please choose another" msgstr "" -#: forum/utils/forms.py:128 +#: forum/utils/forms.py:140 msgid "choose password" msgstr "Password" -#: forum/utils/forms.py:129 +#: forum/utils/forms.py:141 msgid "password is required" msgstr "" -#: forum/utils/forms.py:132 +#: forum/utils/forms.py:144 msgid "retype password" msgstr "Password <i>(please retype)</i>" -#: forum/utils/forms.py:133 +#: forum/utils/forms.py:145 msgid "please, retype your password" msgstr "" -#: forum/utils/forms.py:134 +#: forum/utils/forms.py:146 msgid "sorry, entered passwords did not match, please try again" msgstr "" -#: forum/views/auth.py:94 forum/views/auth.py:103 +#: 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:96 +#: forum/views/auth.py:101 msgid "You are already logged in with that user." msgstr "" -#: forum/views/auth.py:101 +#: forum/views/auth.py:106 msgid "These login credentials are already associated with your account." msgstr "" -#: forum/views/auth.py:107 -msgid "These new credentials are now associated with your account." +#: forum/views/auth.py:112 +msgid "The new credentials are now associated with your account" msgstr "" -#: forum/views/commands.py:217 +#: 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" msgstr "" "Your subscription is saved, but email address %(email)s needs to be " "validated, please see <a href='%(details_url)s'>more details here</a>" -#: forum/views/commands.py:225 +#: forum/views/commands.py:217 msgid "email update frequency has been set to daily" msgstr "" @@ -3521,24 +3877,20 @@ msgstr "" msgid "profile - email subscriptions" msgstr "" -#: forum/views/users.py:977 -msgid "Password changed." -msgstr "" - -#: forum/views/writers.py:74 +#: forum/views/writers.py:70 msgid "uploading images is limited to users with >60 reputation points" msgstr "sorry, file uploading requires karma >60" -#: forum/views/writers.py:76 +#: forum/views/writers.py:72 msgid "allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'" msgstr "" -#: forum/views/writers.py:78 +#: forum/views/writers.py:74 #, python-format msgid "maximum upload file size is %sK" msgstr "" -#: forum/views/writers.py:80 +#: forum/views/writers.py:76 #, python-format msgid "" "Error uploading file. Please contact the site administrator. Thank you. %s" @@ -3564,34 +3916,14 @@ msgid "" "tokens" msgstr "" -#: forum_modules/localauth/forms.py:59 -msgid "Please enter valid username and password (both are case-sensitive)." -msgstr "" - -#: forum_modules/localauth/forms.py:62 -msgid "This account is inactive." -msgstr "" - -#: forum_modules/localauth/forms.py:64 -msgid "Login failed." -msgstr "" - -#: forum_modules/localauth/forms.py:66 -msgid "Please enter username and password" -msgstr "" - -#: forum_modules/localauth/forms.py:68 -msgid "Please enter your password" -msgstr "" - -#: forum_modules/localauth/forms.py:70 -msgid "Please enter user name" -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 "" @@ -3624,39 +3956,38 @@ msgstr "" msgid "Enter your OpenId Url" msgstr "" -#~ msgid "Incorrect username." -#~ msgstr "sorry, there is no such user name" - -#~ msgid "Welcome email subject line" -#~ msgstr "Welcome to the Q&A forum" - -#~ msgid "your email needs to be validated see %(details_url)s" -#~ msgstr "" -#~ "Your email needs to be validated. Please see details <a " -#~ "id='validate_email_alert' href='%(details_url)s'>here</a>." - -#~ msgid "Email verification subject line" -#~ msgstr "Verification Email from Q&A forum" - -#~ msgid "first time greeting with %(url)s" -#~ msgstr "Hello and welcome to OSQA - <a href='%(url)s'>please join us</a>!" +#: stackexchange/management/commands/load_stackexchange.py:124 +msgid "Congratulations, you are now an Administrator" +msgstr "" -#~ msgid "have %(num_q)s unanswered questions" -#~ msgstr "" -#~ "<div class=\"questions-count\">%(num_q)s</div>questions <strong>without " -#~ "accepted answers</strong>" +#~ msgid "" +#~ "\n" +#~ " have total %(q_num)s unanswered questions\n" +#~ " " +#~ msgid_plural "" +#~ "\n" +#~ " have total %(q_num)s unanswered questions\n" +#~ " " +#~ msgstr[0] "" +#~ "\n" +#~ "<div class=\"questions-count\">%(q_num)s</div><p>question without an " +#~ "accepted answer</p>" +#~ msgstr[1] "" +#~ "\n" +#~ "<div class=\"questions-count\">%(q_num)s</div><p>questions without an " +#~ "accepted answer</p>" #~ msgid "" #~ "\n" -#~ "\t\t\t\thave total %(q_num)s questions\n" -#~ "\t\t\t\t" +#~ " have total %(q_num)s questions\n" +#~ " " #~ msgid_plural "" #~ "\n" -#~ "\t\t\t\thave total %(q_num)s questions\n" -#~ "\t\t\t\t" +#~ " have total %(q_num)s questions\n" +#~ " " #~ 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>" +#~ "<div class=\"questions-count\">%(q_num)s</div><p>questions<p>" |