diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2010-03-27 11:38:06 -0400 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2010-03-27 11:38:06 -0400 |
| commit | 9413c12d2126d4f86f2340e458226e72c0d4ecec (patch) | |
| tree | b8c6cb667db07cb0247c07a3e09c222f412d6a99 /locale/en | |
| parent | c50f61d34bf8b5431e8557a48b81a57026b3f0da (diff) | |
| parent | 5c483bace8ac3066b88f2ce7ecb8c95a34aea07d (diff) | |
| download | askbot-9413c12d2126d4f86f2340e458226e72c0d4ecec.tar.gz askbot-9413c12d2126d4f86f2340e458226e72c0d4ecec.tar.bz2 askbot-9413c12d2126d4f86f2340e458226e72c0d4ecec.zip | |
intermediate commit after merge
Diffstat (limited to 'locale/en')
| -rw-r--r-- | locale/en/LC_MESSAGES/django.mo | bin | 26619 -> 26871 bytes | |||
| -rw-r--r-- | locale/en/LC_MESSAGES/django.po | 1508 |
2 files changed, 867 insertions, 641 deletions
diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo Binary files differindex 3107733e..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 0ad97472..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-24 14:27-0400\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,158 +16,6 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: deps/recaptcha_django/__init__.py:18 deps/recaptcha_django/__init__.py:75 -msgid "Unknown error." -msgstr "" - -#: deps/recaptcha_django/__init__.py:19 deps/recaptcha_django/__init__.py:20 -msgid "ReCAPTCHA is wrongly configured." -msgstr "" - -#: deps/recaptcha_django/__init__.py:21 -msgid "Bad reCAPTCHA challenge parameter." -msgstr "" - -#: deps/recaptcha_django/__init__.py:22 -msgid "The CAPTCHA solution was incorrect." -msgstr "" - -#: deps/recaptcha_django/__init__.py:23 -msgid "Bad reCAPTCHA verification parameters." -msgstr "" - -#: deps/recaptcha_django/__init__.py:24 -msgid "Provided reCAPTCHA API keys are not valid for this domain." -msgstr "" - -#: deps/recaptcha_django/__init__.py:25 -msgid "ReCAPTCHA could not be reached." -msgstr "" - -#: deps/recaptcha_django/__init__.py:68 -msgid "Invalid request" -msgstr "" - -#: django-multilingual-read-only/multilingual/flatpages/admin.py:9 -#: django-multilingual-read-only/multilingual/flatpages/models.py:9 -msgid "URL" -msgstr "" - -#: django-multilingual-read-only/multilingual/flatpages/admin.py:10 -msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "" - -#: django-multilingual-read-only/multilingual/flatpages/admin.py:12 -msgid "" -"This value must contain only letters, numbers, underscores, dashes or " -"slashes." -msgstr "" - -#: django-multilingual-read-only/multilingual/flatpages/admin.py:23 -msgid "Advanced options" -msgstr "" - -#: django-multilingual-read-only/multilingual/flatpages/models.py:10 -msgid "enable comments" -msgstr "" - -#: django-multilingual-read-only/multilingual/flatpages/models.py:11 -msgid "template name" -msgstr "" - -#: django-multilingual-read-only/multilingual/flatpages/models.py:12 -msgid "" -"Example: 'flatpages/contact_page.html'. If this isn't provided, the system " -"will use 'flatpages/default.html'." -msgstr "" - -#: django-multilingual-read-only/multilingual/flatpages/models.py:13 -msgid "registration required" -msgstr "" - -#: django-multilingual-read-only/multilingual/flatpages/models.py:13 -msgid "If this is checked, only logged-in users will be able to view the page." -msgstr "" - -#: django-multilingual-read-only/multilingual/flatpages/models.py:30 -#: forum/forms.py:20 forum/skins/default/templates/answer_edit_tips.html:35 -#: forum/skins/default/templates/answer_edit_tips.html:39 -#: forum/skins/default/templates/question_edit_tips.html:32 -#: forum/skins/default/templates/question_edit_tips.html:37 -msgid "title" -msgstr "" - -#: django-multilingual-read-only/multilingual/flatpages/models.py:31 -#: forum/forms.py:35 -msgid "content" -msgstr "" - -#: django-multilingual-read-only/multilingual/flatpages/models.py:35 -msgid "multilingual flat page" -msgstr "" - -#: django-multilingual-read-only/multilingual/flatpages/models.py:36 -msgid "multilingual flat pages" -msgstr "" - -#: django-multilingual-read-only/testproject/articles/models.py:267 -#: django-multilingual-read-only/testproject/articles/models.py:325 -msgid "Created by" -msgstr "" - -#: django-multilingual-read-only/testproject/articles/models.py:269 -#: django-multilingual-read-only/testproject/articles/models.py:327 -msgid "Created at" -msgstr "" - -#: django-multilingual-read-only/testproject/articles/models.py:271 -#: django-multilingual-read-only/testproject/articles/models.py:329 -#: django-multilingual-read-only/testproject/issue_16/models/category.py:11 -#: django-multilingual-read-only/testproject/issue_16/models/page.py:12 -msgid "Parent category" -msgstr "" - -#: django-multilingual-read-only/testproject/articles/models.py:289 -#: django-multilingual-read-only/testproject/issue_16/models/category.py:15 -msgid "The name" -msgstr "" - -#: django-multilingual-read-only/testproject/articles/models.py:291 -msgid "The description" -msgstr "" - -#: django-multilingual-read-only/testproject/articles/models.py:336 -#: django-multilingual-read-only/testproject/issue_16/models/page.py:16 -msgid "The title" -msgstr "" - -#: django-multilingual-read-only/testproject/articles/models.py:338 -#: django-multilingual-read-only/testproject/issue_16/models/page.py:18 -msgid "The contents" -msgstr "" - -#: django-multilingual-read-only/testproject/issue_15/models.py:36 -#: django-multilingual-read-only/testproject/issue_29/models.py:36 -msgid "Parent gallery" -msgstr "" - -#: django-multilingual-read-only/testproject/issue_15/models.py:37 -#: django-multilingual-read-only/testproject/issue_29/models.py:38 -msgid "Modified" -msgstr "" - -#: django-multilingual-read-only/testproject/issue_15/models.py:40 -#: django-multilingual-read-only/testproject/issue_29/models.py:41 -#: django-multilingual-read-only/testproject/issue_37/models.py:34 -msgid "Title" -msgstr "" - -#: django-multilingual-read-only/testproject/issue_15/models.py:41 -#: django-multilingual-read-only/testproject/issue_29/models.py:42 -msgid "Description" -msgstr "" - #: django_authopenid/forms.py:71 django_authopenid/views.py:118 msgid "i-names are not supported" msgstr "" @@ -180,27 +28,28 @@ msgstr "" msgid "can't have two logins to the same account yet, sorry." msgstr "" -#: django_authopenid/forms.py:157 +#: 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 +#: django_authopenid/forms.py:162 forum_modules/localauth/forms.py:64 msgid "Login failed." msgstr "" -#: django_authopenid/forms.py:164 +#: django_authopenid/forms.py:164 forum_modules/localauth/forms.py:66 msgid "Please enter username and password" msgstr "" -#: django_authopenid/forms.py:166 +#: django_authopenid/forms.py:166 forum_modules/localauth/forms.py:68 msgid "Please enter your password" msgstr "" -#: django_authopenid/forms.py:168 +#: django_authopenid/forms.py:168 forum_modules/localauth/forms.py:70 msgid "Please enter user name" msgstr "" @@ -210,11 +59,11 @@ msgid "" "both fields are case-sensitive." msgstr "" -#: django_authopenid/forms.py:229 +#: django_authopenid/forms.py:229 forum/authentication/forms.py:60 msgid "Current password" msgstr "" -#: django_authopenid/forms.py:240 +#: django_authopenid/forms.py:240 forum/authentication/forms.py:71 msgid "" "Old password is incorrect. Please enter the correct " "password." @@ -231,7 +80,7 @@ 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:32 +#: forum/urls.py:93 forum/urls.py:95 forum/urls.py:96 msgid "signin/" msgstr "" @@ -243,7 +92,7 @@ msgstr "" msgid "newanswer/" msgstr "" -#: django_authopenid/urls.py:26 +#: django_authopenid/urls.py:26 forum/urls.py:94 msgid "signout/" msgstr "" @@ -252,7 +101,7 @@ msgid "complete/" msgstr "" #: django_authopenid/urls.py:29 fbconnect/urls.py:16 fbconnect/urls.py:17 -#: fbconnect/urls.py:18 +#: fbconnect/urls.py:18 forum/urls.py:98 forum_modules/localauth/urls.py:7 msgid "register/" msgstr "" @@ -281,7 +130,7 @@ msgstr "" msgid "email/" msgstr "" -#: django_authopenid/urls.py:38 +#: django_authopenid/urls.py:38 forum/urls.py:99 msgid "validate/" msgstr "" @@ -394,19 +243,19 @@ msgstr "" msgid "Password changed for %s. You may now sign in." msgstr "" -#: forum/auth.py:484 +#: 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 "" @@ -423,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 @@ -431,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 @@ -514,6 +367,22 @@ msgstr "" msgid "email update sent to user" msgstr "" +#: forum/const.py:78 +msgid "question_answered" +msgstr "answered question" + +#: forum/const.py:79 +msgid "question_commented" +msgstr "commented question" + +#: forum/const.py:80 +msgid "answer_commented" +msgstr "" + +#: forum/const.py:81 +msgid "answer_accepted" +msgstr "" + #: forum/const.py:85 msgid "[closed]" msgstr "" @@ -522,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 "" @@ -546,47 +415,58 @@ msgstr "" msgid "latest questions" msgstr "" -#: forum/forms.py:21 +#: forum/forms.py:22 forum/skins/default/templates/answer_edit_tips.html:35 +#: forum/skins/default/templates/answer_edit_tips.html:39 +#: forum/skins/default/templates/question_edit_tips.html:32 +#: forum/skins/default/templates/question_edit_tips.html:37 +msgid "title" +msgstr "" + +#: forum/forms.py:23 msgid "please enter a descriptive title for your question" msgstr "" -#: forum/forms.py:26 +#: forum/forms.py:28 msgid "title must be > 10 characters" msgstr "" -#: forum/forms.py:41 +#: forum/forms.py:37 +msgid "content" +msgstr "" + +#: forum/forms.py:43 msgid "question content must be > 10 characters" msgstr "" -#: forum/forms.py:51 forum/skins/default/templates/header.html:32 -#: forum/skins/default/templates/header.html:60 +#: forum/forms.py:52 forum/skins/default/templates/header.html:28 +#: forum/skins/default/templates/header.html:56 msgid "tags" msgstr "" -#: forum/forms.py:53 +#: forum/forms.py:54 msgid "" "Tags are short keywords, with no spaces within. Up to five tags can be used." msgstr "" -#: forum/forms.py:60 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:66 +#: forum/forms.py:67 msgid "please use 5 tags or less" msgstr "" -#: forum/forms.py:69 +#: forum/forms.py:70 msgid "tags must be shorter than 20 characters" msgstr "" -#: forum/forms.py:73 +#: forum/forms.py:74 msgid "" "please use following characters in tags: letters 'a-z', numbers, and " "characters '.-_#'" msgstr "" -#: forum/forms.py:83 +#: 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 @@ -595,116 +475,116 @@ msgstr "" msgid "community wiki" msgstr "" -#: forum/forms.py:84 +#: 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:100 +#: forum/forms.py:101 msgid "update summary:" msgstr "" -#: forum/forms.py:101 +#: 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:104 +#: forum/forms.py:105 msgid "Automatically accept user's contributions for the email updates" msgstr "" -#: forum/forms.py:120 +#: forum/forms.py:121 msgid "Your name:" msgstr "" -#: forum/forms.py:121 +#: forum/forms.py:122 msgid "Email (not shared with anyone):" msgstr "" -#: forum/forms.py:122 +#: forum/forms.py:123 msgid "Your message:" msgstr "" -#: forum/forms.py:204 +#: forum/forms.py:206 msgid "this email does not have to be linked to gravatar" msgstr "" -#: forum/forms.py:206 +#: forum/forms.py:208 msgid "Screen name" msgstr "" -#: forum/forms.py:207 +#: forum/forms.py:209 msgid "Real name" msgstr "" -#: forum/forms.py:208 +#: forum/forms.py:210 msgid "Website" msgstr "" -#: forum/forms.py:209 +#: forum/forms.py:211 msgid "Location" msgstr "" -#: forum/forms.py:210 +#: forum/forms.py:212 msgid "Date of birth" msgstr "" -#: forum/forms.py:210 +#: forum/forms.py:212 msgid "will not be shown, used to calculate age, format: YYYY-MM-DD" msgstr "" -#: forum/forms.py:211 +#: forum/forms.py:213 forum/skins/default/templates/account_settings.html:21 #: forum/skins/default/templates/authopenid/settings.html:21 msgid "Profile" msgstr "" -#: forum/forms.py:242 forum/forms.py:243 +#: forum/forms.py:244 forum/forms.py:245 msgid "this email has already been registered, please use another one" msgstr "" -#: forum/forms.py:249 +#: forum/forms.py:251 msgid "Choose email tag filter" msgstr "" -#: forum/forms.py:264 forum/forms.py:265 +#: forum/forms.py:267 forum/forms.py:268 msgid "weekly" msgstr "" -#: forum/forms.py:264 forum/forms.py:265 +#: forum/forms.py:267 forum/forms.py:268 msgid "no email" msgstr "" -#: forum/forms.py:265 +#: forum/forms.py:268 msgid "daily" msgstr "" -#: forum/forms.py:280 +#: forum/forms.py:283 msgid "Asked by me" msgstr "" -#: forum/forms.py:283 +#: forum/forms.py:286 msgid "Answered by me" msgstr "" -#: forum/forms.py:286 +#: forum/forms.py:289 msgid "Individually selected" msgstr "" -#: forum/forms.py:289 +#: forum/forms.py:292 msgid "Entire forum (tag filtered)" msgstr "" -#: forum/forms.py:343 +#: forum/forms.py:346 forum/authentication/forms.py:41 msgid "okay, let's try!" msgstr "" -#: forum/forms.py:344 +#: forum/forms.py:347 msgid "no community email please, thanks" msgstr "no askbot email please, thanks" -#: forum/forms.py:347 +#: forum/forms.py:350 forum/authentication/forms.py:45 msgid "please choose one of the options above" msgstr "" @@ -779,7 +659,7 @@ msgstr "" msgid "command/" msgstr "" -#: forum/urls.py:60 forum/views/readers.py:435 +#: forum/urls.py:60 forum/views/readers.py:436 msgid "question/" msgstr "" @@ -839,15 +719,62 @@ msgstr "" msgid "feedback/" msgstr "" -#: forum/urls.py:89 forum/urls.py:90 +#: forum/urls.py:93 forum/urls.py:94 forum/urls.py:95 forum/urls.py:96 +#: forum/urls.py:97 forum/urls.py:98 forum/urls.py:99 forum/urls.py:100 +#: forum/urls.py:101 forum/urls.py:102 forum/urls.py:103 forum/urls.py:104 +#: forum_modules/localauth/urls.py:7 msgid "account/" msgstr "" -#: forum/management/commands/send_email_alerts.py:156 +#: forum/urls.py:97 +msgid "done/" +msgstr "" + +#: forum/urls.py:100 forum/urls.py:101 +msgid "tempsignin/" +msgstr "" + +#: forum/urls.py:102 +msgid "authsettings/" +msgstr "" + +#: forum/urls.py:103 forum/urls.py:104 +msgid "providers/" +msgstr "" + +#: forum/urls.py:103 +msgid "remove/" +msgstr "" + +#: forum/urls.py:104 +msgid "add/" +msgstr "" + +#: forum/authentication/forms.py:22 +msgid "Your account email" +msgstr "" + +#: forum/authentication/forms.py:24 +msgid "You cannot leave this field blank" +msgstr "" + +#: forum/authentication/forms.py:25 forum/utils/forms.py:111 +msgid "please enter a valid email address" +msgstr "" + +#: forum/authentication/forms.py:33 +msgid "Sorry, but this email is not on our database." +msgstr "" + +#: forum/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" @@ -858,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:184 +#: forum/management/commands/send_email_alerts.py:290 msgid "" -"Perhaps you could look up previously sent forum reminders in your mailbox." +"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:188 +#: forum/management/commands/send_email_alerts.py:296 +msgid "" +"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:311 #, python-format msgid "" "go to %(link)s to change frequency of email updates or %(email)s " @@ -887,45 +828,45 @@ msgstr "" "administrator at %(email)s.</p><p>Sincerely,</p><p>Your friendly Q&A forum " "server.</p>" -#: forum/middleware/anon_user.py:33 +#: forum/middleware/anon_user.py:34 #, python-format -msgid "first time greeting with %(url)s" +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 "" -#: forum/models/repute.py:11 forum/skins/default/templates/badges.html:53 +#: forum/models/repute.py:13 forum/skins/default/templates/badges.html:53 msgid "gold" msgstr "" -#: forum/models/repute.py:12 forum/skins/default/templates/badges.html:61 +#: forum/models/repute.py:14 forum/skins/default/templates/badges.html:61 msgid "silver" msgstr "" -#: forum/models/repute.py:13 forum/skins/default/templates/badges.html:68 +#: forum/models/repute.py:15 forum/skins/default/templates/badges.html:68 msgid "bronze" msgstr "" @@ -937,31 +878,31 @@ msgstr "" msgid "ignored" msgstr "" -#: forum/models/user.py:31 +#: forum/models/user.py:36 msgid "Entire forum" msgstr "" -#: forum/models/user.py:32 +#: forum/models/user.py:37 msgid "Questions that I asked" msgstr "" -#: forum/models/user.py:33 +#: forum/models/user.py:38 msgid "Questions that I answered" msgstr "" -#: forum/models/user.py:34 +#: forum/models/user.py:39 msgid "Individually selected questions" msgstr "" -#: forum/models/user.py:37 +#: forum/models/user.py:42 msgid "Weekly" msgstr "" -#: forum/models/user.py:38 +#: forum/models/user.py:43 msgid "Daily" msgstr "" -#: forum/models/user.py:39 +#: forum/models/user.py:44 msgid "No email" msgstr "" @@ -1033,6 +974,57 @@ msgstr "" msgid "About" msgstr "" +#: forum/skins/default/templates/account_settings.html:4 +#: forum/skins/default/templates/authopenid/settings.html:4 +msgid "Account functions" +msgstr "" + +#: forum/skins/default/templates/account_settings.html:29 +#: forum/skins/default/templates/auth/auth_settings.html:31 +#: forum/skins/default/templates/authopenid/changepw.html:5 +#: forum/skins/default/templates/authopenid/changepw.html:14 +#: forum/skins/default/templates/authopenid/settings.html:29 +msgid "Change password" +msgstr "" + +#: forum/skins/default/templates/account_settings.html:30 +#: forum/skins/default/templates/authopenid/settings.html:30 +msgid "Give your account a new password." +msgstr "" + +#: forum/skins/default/templates/account_settings.html:32 +#: forum/skins/default/templates/authopenid/settings.html:31 +msgid "Change email " +msgstr "" + +#: forum/skins/default/templates/account_settings.html:33 +#: forum/skins/default/templates/authopenid/settings.html:32 +msgid "Add or update the email address associated with your account." +msgstr "" + +#: forum/skins/default/templates/account_settings.html:35 +#: forum/skins/default/templates/authopenid/changeopenid.html:4 +#: forum/skins/default/templates/authopenid/changeopenid.html:30 +#: forum/skins/default/templates/authopenid/settings.html:34 +msgid "Change OpenID" +msgstr "" + +#: forum/skins/default/templates/account_settings.html:36 +#: forum/skins/default/templates/authopenid/settings.html:35 +msgid "Change openid associated to your account" +msgstr "" + +#: forum/skins/default/templates/account_settings.html:39 +#: forum/skins/default/templates/authopenid/delete.html:4 +#: forum/skins/default/templates/authopenid/settings.html:38 +msgid "Delete account" +msgstr "" + +#: forum/skins/default/templates/account_settings.html:40 +#: forum/skins/default/templates/authopenid/settings.html:39 +msgid "Erase your username and all your data from website" +msgstr "" + #: forum/skins/default/templates/answer_edit.html:5 #: forum/skins/default/templates/answer_edit.html:48 msgid "Edit answer" @@ -1042,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" @@ -1051,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 "" @@ -1078,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:430 +#: 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:431 +#: forum/skins/default/templates/question.html:432 #: forum/skins/default/templates/question_edit.html:92 msgid "toggle preview" msgstr "" @@ -1353,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 @@ -1366,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 @@ -1375,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:476 +#: 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 @@ -1390,7 +1382,7 @@ 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 "" @@ -1412,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 "" @@ -1548,11 +1544,11 @@ msgstr "" msgid "delete any questions and answers and perform other moderation tasks" msgstr "" -#: forum/skins/default/templates/faq.html:102 +#: forum/skins/default/templates/faq.html:103 msgid "how to validate email title" msgstr "How to validate email and why?" -#: forum/skins/default/templates/faq.html:104 +#: forum/skins/default/templates/faq.html:105 #, python-format msgid "" "how to validate email info with %(send_email_key_url)s %(gravatar_faq_url)s" @@ -1570,11 +1566,11 @@ msgstr "" "Also, when you sign up for the first time - create a unique <a href='%" "(gravatar_faq_url)s'><strong>gravatar</strong></a> personal image.</p>" -#: forum/skins/default/templates/faq.html:108 +#: forum/skins/default/templates/faq.html:110 msgid "what is gravatar" msgstr "What is gravatar?" -#: forum/skins/default/templates/faq.html:109 +#: forum/skins/default/templates/faq.html:111 msgid "gravatar faq info" msgstr "" "<strong>Gravatar</strong> means <strong>g</strong>lobally <strong>r</" @@ -1585,44 +1581,44 @@ msgstr "" "your image</strong> at <a href='http://gravatar.com'><strong>gravatar.com</" "strong></a>" -#: forum/skins/default/templates/faq.html:112 +#: forum/skins/default/templates/faq.html:114 msgid "To register, do I need to create new password?" msgstr "" -#: forum/skins/default/templates/faq.html:113 +#: forum/skins/default/templates/faq.html:115 msgid "" "No, you don't have to. You can login through any service that supports " "OpenID, e.g. Google, Yahoo, AOL, etc." msgstr "" -#: forum/skins/default/templates/faq.html:114 +#: forum/skins/default/templates/faq.html:116 msgid "Login now!" msgstr "" -#: forum/skins/default/templates/faq.html:119 +#: forum/skins/default/templates/faq.html:121 msgid "Why other people can edit my questions/answers?" msgstr "" -#: forum/skins/default/templates/faq.html:120 +#: forum/skins/default/templates/faq.html:122 msgid "Goal of this site is..." msgstr "" -#: forum/skins/default/templates/faq.html:120 +#: forum/skins/default/templates/faq.html:122 msgid "" "So questions and answers can be edited like wiki pages by experienced users " "of this site and this improves the overall quality of the knowledge base " "content." msgstr "" -#: forum/skins/default/templates/faq.html:121 +#: forum/skins/default/templates/faq.html:123 msgid "If this approach is not for you, we respect your choice." msgstr "" -#: forum/skins/default/templates/faq.html:125 +#: forum/skins/default/templates/faq.html:127 msgid "Still have questions?" msgstr "" -#: forum/skins/default/templates/faq.html:126 +#: forum/skins/default/templates/faq.html:128 #, python-format msgid "" "Please ask your question at %(ask_question_url)s, help make our community " @@ -1631,14 +1627,14 @@ msgstr "" "Please <a href='%(ask_question_url)s'>ask</a> your question, help make our " "community better!" -#: forum/skins/default/templates/faq.html:128 -#: forum/skins/default/templates/header.html:31 -#: forum/skins/default/templates/header.html:59 +#: forum/skins/default/templates/faq.html:130 +#: forum/skins/default/templates/header.html:27 +#: forum/skins/default/templates/header.html:55 msgid "questions" msgstr "" -#: forum/skins/default/templates/faq.html:128 -#: forum/skins/default/templates/index.html:121 +#: forum/skins/default/templates/faq.html:130 +#: forum/skins/default/templates/index.html:92 #: forum/skins/default/templates/index_.html:121 msgid "." msgstr "" @@ -1703,15 +1699,15 @@ msgid "Message body:" msgstr "" #: forum/skins/default/templates/footer.html:8 -#: forum/skins/default/templates/header.html:14 -#: forum/skins/default/templates/index.html:77 +#: forum/skins/default/templates/header.html:13 +#: 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:15 -#: forum/skins/default/templates/index.html:78 +#: forum/skins/default/templates/header.html:14 +#: 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" @@ -1733,180 +1729,177 @@ msgstr "" msgid "login" msgstr "" -#: forum/skins/default/templates/header.html:24 +#: forum/skins/default/templates/header.html:21 msgid "back to home page" msgstr "" -#: forum/skins/default/templates/header.html:33 -#: forum/skins/default/templates/header.html:61 +#: forum/skins/default/templates/header.html:29 +#: forum/skins/default/templates/header.html:57 msgid "users" msgstr "" -#: forum/skins/default/templates/header.html:35 +#: forum/skins/default/templates/header.html:31 msgid "books" msgstr "" -#: forum/skins/default/templates/header.html:37 -#: forum/templatetags/extra_tags.py:165 forum/templatetags/extra_tags.py:194 +#: forum/skins/default/templates/header.html:33 +#: forum/templatetags/extra_tags.py:166 forum/templatetags/extra_tags.py:195 msgid "badges" msgstr "" -#: forum/skins/default/templates/header.html:38 +#: forum/skins/default/templates/header.html:34 msgid "unanswered questions" msgstr "unanswered" -#: forum/skins/default/templates/header.html:40 +#: forum/skins/default/templates/header.html:36 msgid "ask a question" msgstr "" -#: forum/skins/default/templates/header.html:55 +#: forum/skins/default/templates/header.html:51 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:476 -#: 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" @@ -2051,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" @@ -2136,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" @@ -2151,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" @@ -2175,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" @@ -2246,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" @@ -2261,19 +2254,19 @@ 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 "" "You can always adjust frequency of email updates from your %(profile_url)s" @@ -2281,21 +2274,21 @@ msgstr "" "(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:392 +#: 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:403 +#: forum/skins/default/templates/question.html:404 msgid "Your answer" msgstr "" -#: forum/skins/default/templates/question.html:405 +#: forum/skins/default/templates/question.html:406 msgid "Be the first one to answer this question!" msgstr "" -#: forum/skins/default/templates/question.html:411 +#: 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> " @@ -2304,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:415 +#: 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>, " @@ -2314,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:417 +#: 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 " @@ -2324,39 +2317,39 @@ 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:453 +#: forum/skins/default/templates/question.html:454 msgid "Login/Signup to Post Your Answer" msgstr "" -#: forum/skins/default/templates/question.html:456 +#: forum/skins/default/templates/question.html:457 msgid "Answer Your Own Question" msgstr "" -#: forum/skins/default/templates/question.html:458 +#: forum/skins/default/templates/question.html:459 msgid "Answer the question" msgstr "Post Your Answer" -#: forum/skins/default/templates/question.html:471 +#: forum/skins/default/templates/question.html:473 msgid "Question tags" msgstr "Tags" -#: forum/skins/default/templates/question.html:481 +#: forum/skins/default/templates/question.html:483 msgid "question asked" msgstr "Asked" -#: forum/skins/default/templates/question.html:484 +#: forum/skins/default/templates/question.html:486 msgid "question was seen" msgstr "Seen" -#: forum/skins/default/templates/question.html:484 +#: forum/skins/default/templates/question.html:486 msgid "times" msgstr "" -#: forum/skins/default/templates/question.html:487 +#: forum/skins/default/templates/question.html:489 msgid "last updated" msgstr "Last updated" -#: forum/skins/default/templates/question.html:492 +#: forum/skins/default/templates/question.html:495 msgid "Related questions" msgstr "" @@ -2504,10 +2497,8 @@ msgstr[1] "" #, python-format 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>" +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:181 msgid "latest questions info" @@ -2613,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 @@ -2698,7 +2689,7 @@ msgid "Stop sending email" msgstr "Stop Email" #: forum/skins/default/templates/user_info.html:22 -#: forum/skins/default/templates/users.html:26 forum/views/users.py:907 +#: forum/skins/default/templates/users.html:26 forum/views/users.py:916 msgid "reputation" msgstr "karma" @@ -2863,19 +2854,19 @@ msgstr[1] "" msgid "User profile" msgstr "" -#: forum/skins/default/templates/user_tabs.html:7 forum/views/users.py:881 +#: forum/skins/default/templates/user_tabs.html:7 forum/views/users.py:890 msgid "overview" msgstr "" -#: forum/skins/default/templates/user_tabs.html:9 forum/views/users.py:889 +#: forum/skins/default/templates/user_tabs.html:9 forum/views/users.py:898 msgid "recent activity" msgstr "" -#: forum/skins/default/templates/user_tabs.html:12 forum/views/users.py:899 +#: forum/skins/default/templates/user_tabs.html:12 forum/views/users.py:908 msgid "comments and answers to others questions" msgstr "" -#: forum/skins/default/templates/user_tabs.html:13 forum/views/users.py:898 +#: forum/skins/default/templates/user_tabs.html:13 forum/views/users.py:907 msgid "responses" msgstr "" @@ -2887,11 +2878,11 @@ msgstr "Graph of user karma" msgid "reputation history" msgstr "karma history" -#: forum/skins/default/templates/user_tabs.html:20 forum/views/users.py:925 +#: forum/skins/default/templates/user_tabs.html:20 forum/views/users.py:934 msgid "user vote record" msgstr "" -#: forum/skins/default/templates/user_tabs.html:20 forum/views/users.py:924 +#: forum/skins/default/templates/user_tabs.html:20 forum/views/users.py:933 msgid "casted votes" msgstr "votes" @@ -2903,11 +2894,11 @@ msgstr "" msgid "favorites" msgstr "" -#: forum/skins/default/templates/user_tabs.html:27 forum/views/users.py:934 +#: forum/skins/default/templates/user_tabs.html:27 forum/views/users.py:943 msgid "email subscription settings" msgstr "" -#: forum/skins/default/templates/user_tabs.html:28 forum/views/users.py:933 +#: forum/skins/default/templates/user_tabs.html:28 forum/views/users.py:942 msgid "email subscriptions" msgstr "" @@ -2949,6 +2940,323 @@ msgstr "" msgid "thumb-up off" msgstr "" +#: forum/skins/default/templates/auth/auth_settings.html:5 +#: forum/skins/default/templates/auth/auth_settings.html:7 +msgid "Authentication settings" +msgstr "" + +#: forum/skins/default/templates/auth/auth_settings.html:9 +msgid "" +"These are the external authentication providers currently associated with " +"your account." +msgstr "" + +#: forum/skins/default/templates/auth/auth_settings.html:12 +msgid "remove" +msgstr "" + +#: forum/skins/default/templates/auth/auth_settings.html:17 +msgid "" +"You currently have no external authentication provider associated with your " +"account." +msgstr "" + +#: forum/skins/default/templates/auth/auth_settings.html:19 +msgid "Add new provider" +msgstr "" + +#: forum/skins/default/templates/auth/auth_settings.html:21 +#: forum/skins/default/templates/authopenid/changepw.html:8 +msgid "This is where you can change your password. Make sure you remember it!" +msgstr "" +"<span class='strong'>To change your password</span> please fill out and " +"submit this form" + +#: forum/skins/default/templates/auth/auth_settings.html:24 +msgid "" +"You can set up a password for your account, so you can login using standard " +"username and password!" +msgstr "" + +#: forum/skins/default/templates/auth/auth_settings.html:31 +msgid "Create password" +msgstr "" + +#: forum/skins/default/templates/auth/complete.html:5 +#: forum/skins/default/templates/authopenid/complete.html:19 +msgid "Connect your OpenID with this site" +msgstr "New user signup" + +#: forum/skins/default/templates/auth/complete.html:8 +#: forum/skins/default/templates/authopenid/complete.html:22 +msgid "Connect your OpenID with your account on this site" +msgstr "New user signup" + +#: forum/skins/default/templates/auth/complete.html:12 +msgid "You are here for the first time with " +msgstr "" + +#: forum/skins/default/templates/auth/complete.html:13 +msgid "" +"Please create your screen name and save your email address. Saved email " +"address will let you subscribe for the updates on the most interesting " +"questions and will be used to create and retrieve your unique avatar image. " +msgstr "" + +#: forum/skins/default/templates/auth/complete.html:15 +#: forum/skins/default/templates/authopenid/complete.html:42 +msgid "This account already exists, please use another." +msgstr "" + +#: forum/skins/default/templates/auth/complete.html:30 +#: forum/skins/default/templates/authopenid/complete.html:57 +msgid "Sorry, looks like we have some errors:" +msgstr "" + +#: forum/skins/default/templates/auth/complete.html:47 +#: forum/skins/default/templates/authopenid/complete.html:82 +msgid "Screen name label" +msgstr "<strong>Screen Name</strong> (<i>will be shown to others</i>)" + +#: forum/skins/default/templates/auth/complete.html:54 +#: forum/skins/default/templates/authopenid/complete.html:89 +msgid "Email address label" +msgstr "" +"<strong>Email Address</strong> (<i>will <strong>not</strong> be shared with " +"anyone, must be valid</i>)" + +#: forum/skins/default/templates/auth/complete.html:60 +#: forum/skins/default/templates/auth/signup.html:18 +#: forum/skins/default/templates/authopenid/complete.html:95 +#: forum/skins/default/templates/authopenid/signup.html:18 +msgid "receive updates motivational blurb" +msgstr "" +"<strong>Receive forum updates by email</strong> - this will help our " +"community grow and become more useful.<br/>By default <span " +"class='orange'>Q&A</span> forum sends up to <strong>one email digest per " +"week</strong> - only when there is anything new.<br/>If you like, please " +"adjust this now or any time later from your user account." + +#: forum/skins/default/templates/auth/complete.html:64 +#: forum/skins/default/templates/auth/signup.html:22 +#: forum/skins/default/templates/authopenid/complete.html:99 +#: forum/skins/default/templates/authopenid/signup.html:22 +msgid "please select one of the options above" +msgstr "" + +#: forum/skins/default/templates/auth/complete.html:67 +#: forum/skins/default/templates/authopenid/complete.html:102 +msgid "Tag filter tool will be your right panel, once you log in." +msgstr "" + +#: forum/skins/default/templates/auth/complete.html:68 +#: forum/skins/default/templates/authopenid/complete.html:103 +msgid "create account" +msgstr "Signup" + +#: forum/skins/default/templates/auth/complete.html:77 +#: forum/skins/default/templates/authopenid/complete.html:112 +msgid "Existing account" +msgstr "" + +#: forum/skins/default/templates/auth/complete.html:78 +#: forum/skins/default/templates/authopenid/complete.html:113 +msgid "user name" +msgstr "" + +#: forum/skins/default/templates/auth/complete.html:79 +#: forum/skins/default/templates/authopenid/complete.html:114 +msgid "password" +msgstr "" + +#: forum/skins/default/templates/auth/complete.html:86 +#: forum/skins/default/templates/authopenid/complete.html:121 +msgid "Register" +msgstr "" + +#: forum/skins/default/templates/auth/complete.html:87 +#: forum/skins/default/templates/authopenid/complete.html:122 +#: forum/skins/default/templates/authopenid/signin.html:164 +msgid "Forgot your password?" +msgstr "" + +#: forum/skins/default/templates/auth/email_validation.html:6 +#: forum/skins/default/templates/auth/temp_login_email.html:6 +#: forum/skins/default/templates/authopenid/email_validation.txt:2 +msgid "Greetings from the Q&A forum" +msgstr "" + +#: forum/skins/default/templates/auth/email_validation.html:8 +#: forum/skins/default/templates/authopenid/email_validation.txt:4 +msgid "To make use of the Forum, please follow the link below:" +msgstr "" + +#: forum/skins/default/templates/auth/email_validation.html:12 +#: forum/skins/default/templates/authopenid/email_validation.txt:8 +msgid "Following the link above will help us verify your email address." +msgstr "" + +#: forum/skins/default/templates/auth/email_validation.html:14 +#: forum/skins/default/templates/auth/temp_login_email.html:14 +msgid "" +"If you beleive that this message was sent in mistake -\n" +" no further action is needed. Just ingore this email, we apologize\n" +" for any inconvenience" +msgstr "" + +#: forum/skins/default/templates/auth/email_validation.html:18 +#: forum/skins/default/templates/auth/temp_login_email.html:18 +msgid "" +"Sincerely,<br />\n" +" Forum Administrator" +msgstr "" +"Sincerely,\n" +"Q&A Forum Administrator" + +#: forum/skins/default/templates/auth/signin.html:22 +#: forum/skins/default/templates/authopenid/signin.html:5 +#: forum/skins/default/templates/authopenid/signin.html:21 +msgid "User login" +msgstr "User login" + +#: forum/skins/default/templates/auth/signin.html:29 +#: forum/skins/default/templates/authopenid/signin.html:42 +msgid "Click to sign in through any of these services." +msgstr "" +"<p><span class=\"big strong\">Please select your favorite login method below." +"</span></p><p><font color=\"gray\">External login services use <a href=" +"\"http://openid.net\"><b>OpenID</b></a> technology, where your password " +"always stays confidential between you and your login provider and you don't " +"have to remember another one.</font></p>" + +#: forum/skins/default/templates/auth/signin.html:34 +msgid "" +"Take the oppurtunity to validate my email next to the external provider I " +"choose." +msgstr "" + +#: forum/skins/default/templates/auth/signin.html:76 +#: forum/skins/default/templates/auth/signin.html:82 +msgid "Or..." +msgstr "" + +#: forum/skins/default/templates/auth/signin.html:84 +msgid "Click" +msgstr "" + +#: forum/skins/default/templates/auth/signin.html:84 +msgid "if you're having troubles signing in." +msgstr "" + +#: forum/skins/default/templates/auth/signin.html:88 +msgid "Enter your " +msgstr "" + +#: forum/skins/default/templates/auth/signin.html:144 +#: forum/skins/default/templates/authopenid/signin.html:174 +msgid "Why use OpenID?" +msgstr "" + +#: forum/skins/default/templates/auth/signin.html:147 +#: forum/skins/default/templates/authopenid/signin.html:177 +msgid "with openid it is easier" +msgstr "With the OpenID you don't need to create new username and password." + +#: forum/skins/default/templates/auth/signin.html:150 +#: forum/skins/default/templates/authopenid/signin.html:180 +msgid "reuse openid" +msgstr "You can safely re-use the same login for all OpenID-enabled websites." + +#: forum/skins/default/templates/auth/signin.html:153 +#: forum/skins/default/templates/authopenid/signin.html:183 +msgid "openid is widely adopted" +msgstr "" +"There are > 160,000,000 OpenID account in use. Over 10,000 sites are OpenID-" +"enabled." + +#: forum/skins/default/templates/auth/signin.html:156 +#: forum/skins/default/templates/authopenid/signin.html:186 +msgid "openid is supported open standard" +msgstr "OpenID is based on an open standard, supported by many organizations." + +#: forum/skins/default/templates/auth/signin.html:161 +#: forum/skins/default/templates/authopenid/signin.html:191 +msgid "Find out more" +msgstr "" + +#: forum/skins/default/templates/auth/signin.html:162 +#: forum/skins/default/templates/authopenid/signin.html:192 +msgid "Get OpenID" +msgstr "" + +#: forum/skins/default/templates/auth/signup.html:4 +#: forum/skins/default/templates/authopenid/signup.html:4 +msgid "Signup" +msgstr "" + +#: forum/skins/default/templates/auth/signup.html:8 +#: forum/skins/default/templates/authopenid/signup.html:8 +msgid "Create login name and password" +msgstr "" + +#: forum/skins/default/templates/auth/signup.html:10 +#: forum/skins/default/templates/authopenid/signup.html:10 +msgid "Traditional signup info" +msgstr "" +"<span class='strong big'>If you prefer, create your forum login name and " +"password here. However</span>, please keep in mind that we also support " +"<strong>OpenID</strong> login method. With <strong>OpenID</strong> you can " +"simply reuse your external login (e.g. Gmail or AOL) without ever sharing " +"your login details with anyone and having to remember yet another password." + +#: forum/skins/default/templates/auth/signup.html:25 +#: forum/skins/default/templates/authopenid/signup.html:25 +msgid "" +"Please read and type in the two words below to help us prevent automated " +"account creation." +msgstr "" + +#: forum/skins/default/templates/auth/signup.html:27 +#: forum/skins/default/templates/authopenid/signup.html:27 +msgid "Create Account" +msgstr "" + +#: forum/skins/default/templates/auth/signup.html:29 +msgid "return to login page" +msgstr "" + +#: forum/skins/default/templates/auth/temp_login_email.html:8 +msgid "You're seeing this because someone requested a temporary login link" +msgstr "" + +#: forum/skins/default/templates/auth/temp_login_email.html:12 +msgid "Following the link above will give you access to your account." +msgstr "" + +#: forum/skins/default/templates/auth/temp_login_request.html:5 +msgid "Request temporary login key" +msgstr "" + +#: forum/skins/default/templates/auth/temp_login_request.html:7 +msgid "Account: request temporary login key" +msgstr "" + +#: forum/skins/default/templates/auth/temp_login_request.html:8 +msgid "" +"\n" +" If you're experiencing problems accessing your account, or if you forgot " +"your password,\n" +" here you can request a temporary login key. Fill out your account email " +"and we'll send you a temporary access link that\n" +" will enable you to access your account. This token is valid only once " +"and for a limited period of time.\n" +" " +msgstr "" + +#: forum/skins/default/templates/auth/temp_login_request.html:25 +msgid "Send link" +msgstr "" + #: forum/skins/default/templates/authopenid/changeemail.html:3 #: forum/skins/default/templates/authopenid/changeemail.html:9 #: forum/skins/default/templates/authopenid/changeemail.html:38 @@ -3059,12 +3367,6 @@ msgstr "" "validated before</span> so the new key was not sent. You can <a href='%" "(change_link)s'>change</a> email used for update subscriptions if necessary." -#: forum/skins/default/templates/authopenid/changeopenid.html:4 -#: forum/skins/default/templates/authopenid/changeopenid.html:30 -#: forum/skins/default/templates/authopenid/settings.html:34 -msgid "Change OpenID" -msgstr "" - #: forum/skins/default/templates/authopenid/changeopenid.html:8 msgid "Account: change OpenID URL" msgstr "" @@ -3084,30 +3386,10 @@ msgstr "" msgid "OpenID URL:" msgstr "" -#: forum/skins/default/templates/authopenid/changepw.html:5 -#: forum/skins/default/templates/authopenid/changepw.html:14 -#: forum/skins/default/templates/authopenid/settings.html:29 -msgid "Change password" -msgstr "" - #: forum/skins/default/templates/authopenid/changepw.html:7 msgid "Account: change password" msgstr "Change your password" -#: forum/skins/default/templates/authopenid/changepw.html:8 -msgid "This is where you can change your password. Make sure you remember it!" -msgstr "" -"<span class='strong'>To change your password</span> please fill out and " -"submit this form" - -#: forum/skins/default/templates/authopenid/complete.html:19 -msgid "Connect your OpenID with this site" -msgstr "New user signup" - -#: forum/skins/default/templates/authopenid/complete.html:22 -msgid "Connect your OpenID with your account on this site" -msgstr "New user signup" - #: forum/skins/default/templates/authopenid/complete.html:27 #, python-format msgid "register new %(provider)s account info, see %(gravatar_faq_url)s" @@ -3161,68 +3443,6 @@ msgstr "" "and will be used to create and retrieve your unique avatar image - <a href='%" "(gravatar_faq_url)s'><strong>gravatar</strong></a>.</p>" -#: forum/skins/default/templates/authopenid/complete.html:42 -msgid "This account already exists, please use another." -msgstr "" - -#: forum/skins/default/templates/authopenid/complete.html:57 -msgid "Sorry, looks like we have some errors:" -msgstr "" - -#: forum/skins/default/templates/authopenid/complete.html:82 -msgid "Screen name label" -msgstr "<strong>Screen Name</strong> (<i>will be shown to others</i>)" - -#: forum/skins/default/templates/authopenid/complete.html:89 -msgid "Email address label" -msgstr "" -"<strong>Email Address</strong> (<i>will <strong>not</strong> be shared with " -"anyone, must be valid</i>)" - -#: forum/skins/default/templates/authopenid/complete.html:95 -#: forum/skins/default/templates/authopenid/signup.html:18 -msgid "receive updates motivational blurb" -msgstr "" -"<strong>Receive forum updates by email</strong> - this will help our " -"community grow and become more useful.<br/>By default <span " -"class='orange'>Q&A</span> forum sends up to <strong>one email digest per " -"week</strong> - only when there is anything new.<br/>If you like, please " -"adjust this now or any time later from your user account." - -#: forum/skins/default/templates/authopenid/complete.html:99 -#: forum/skins/default/templates/authopenid/signup.html:22 -msgid "please select one of the options above" -msgstr "" - -#: forum/skins/default/templates/authopenid/complete.html:102 -msgid "Tag filter tool will be your right panel, once you log in." -msgstr "" - -#: forum/skins/default/templates/authopenid/complete.html:103 -msgid "create account" -msgstr "Signup" - -#: forum/skins/default/templates/authopenid/complete.html:112 -msgid "Existing account" -msgstr "" - -#: forum/skins/default/templates/authopenid/complete.html:113 -msgid "user name" -msgstr "" - -#: forum/skins/default/templates/authopenid/complete.html:114 -msgid "password" -msgstr "" - -#: forum/skins/default/templates/authopenid/complete.html:121 -msgid "Register" -msgstr "" - -#: forum/skins/default/templates/authopenid/complete.html:122 -#: forum/skins/default/templates/authopenid/signin.html:164 -msgid "Forgot your password?" -msgstr "" - #: forum/skins/default/templates/authopenid/confirm_email.txt:2 msgid "Thank you for registering at our Q&A forum!" msgstr "" @@ -3254,11 +3474,6 @@ msgstr "" "Sincerely,\n" "Q&A Forum Administrator" -#: forum/skins/default/templates/authopenid/delete.html:4 -#: forum/skins/default/templates/authopenid/settings.html:38 -msgid "Delete account" -msgstr "" - #: forum/skins/default/templates/authopenid/delete.html:8 msgid "Account: delete account" msgstr "" @@ -3289,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" @@ -3361,35 +3564,6 @@ msgstr "" "* login with user name %(username)s and password %(password)s\n" "* go to your user profile and set the password to something you can remember" -#: forum/skins/default/templates/authopenid/settings.html:4 -msgid "Account functions" -msgstr "" - -#: forum/skins/default/templates/authopenid/settings.html:30 -msgid "Give your account a new password." -msgstr "" - -#: forum/skins/default/templates/authopenid/settings.html:31 -msgid "Change email " -msgstr "" - -#: forum/skins/default/templates/authopenid/settings.html:32 -msgid "Add or update the email address associated with your account." -msgstr "" - -#: forum/skins/default/templates/authopenid/settings.html:35 -msgid "Change openid associated to your account" -msgstr "" - -#: forum/skins/default/templates/authopenid/settings.html:39 -msgid "Erase your username and all your data from website" -msgstr "" - -#: forum/skins/default/templates/authopenid/signin.html:5 -#: forum/skins/default/templates/authopenid/signin.html:21 -msgid "User login" -msgstr "User login" - #: forum/skins/default/templates/authopenid/signin.html:28 #, python-format msgid "" @@ -3414,15 +3588,6 @@ msgstr "" "strong> %(summary)s...\"</i> <span class=\"strong big\">is saved and will be " "posted once you log in.</span>" -#: forum/skins/default/templates/authopenid/signin.html:42 -msgid "Click to sign in through any of these services." -msgstr "" -"<p><span class=\"big strong\">Please select your favorite login method below." -"</span></p><p><font color=\"gray\">External login services use <a href=" -"\"http://openid.net\"><b>OpenID</b></a> technology, where your password " -"always stays confidential between you and your login provider and you don't " -"have to remember another one.</font></p>" - # msgid "Click to sign in through any of these services." # msgstr "" # "<p><span class=\"big strong\">Please select your favorite login method below." @@ -3471,63 +3636,6 @@ msgstr "" msgid "Create account" msgstr "" -#: forum/skins/default/templates/authopenid/signin.html:174 -msgid "Why use OpenID?" -msgstr "" - -#: 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/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/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/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/authopenid/signin.html:191 -msgid "Find out more" -msgstr "" - -#: forum/skins/default/templates/authopenid/signin.html:192 -msgid "Get OpenID" -msgstr "" - -#: forum/skins/default/templates/authopenid/signup.html:4 -msgid "Signup" -msgstr "" - -#: forum/skins/default/templates/authopenid/signup.html:8 -msgid "Create login name and password" -msgstr "" - -#: forum/skins/default/templates/authopenid/signup.html:10 -msgid "Traditional signup info" -msgstr "" -"<span class='strong big'>If you prefer, create your forum login name and " -"password here. However</span>, please keep in mind that we also support " -"<strong>OpenID</strong> login method. With <strong>OpenID</strong> you can " -"simply reuse your external login (e.g. Gmail or AOL) without ever sharing " -"your login details with anyone and having to remember yet another password." - -#: forum/skins/default/templates/authopenid/signup.html:25 -msgid "" -"Please read and type in the two words below to help us prevent automated " -"account creation." -msgstr "" - -#: forum/skins/default/templates/authopenid/signup.html:27 -msgid "Create Account" -msgstr "" - #: forum/skins/default/templates/authopenid/signup.html:29 msgid "return to OpenID login" msgstr "" @@ -3537,26 +3645,26 @@ 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" @@ -3603,10 +3711,6 @@ msgstr "Your email <i>(never shared)</i>" msgid "email address is required" msgstr "" -#: forum/utils/forms.py:111 -msgid "please enter a valid email address" -msgstr "" - #: forum/utils/forms.py:112 msgid "this email is already used by someone else, please choose another" msgstr "" @@ -3631,14 +3735,77 @@ msgstr "" msgid "sorry, entered passwords did not match, please try again" msgstr "" -#: forum/views/commands.py:217 +#: forum/views/auth.py:99 forum/views/auth.py:108 +msgid "" +"Sorry, these login credentials belong to anoother user. Plese terminate your " +"current session and try again." +msgstr "" + +#: forum/views/auth.py:101 +msgid "You are already logged in with that user." +msgstr "" + +#: forum/views/auth.py:106 +msgid "These login credentials are already associated with your account." +msgstr "" + +#: forum/views/auth.py:112 +msgid "The new credentials are now associated with your account" +msgstr "" + +#: forum/views/auth.py:150 +msgid "" +"Oops, something went wrong in the middle of this process. Please try again." +msgstr "" + +#: forum/views/auth.py:210 +msgid "Temporary login link" +msgstr "" + +#: forum/views/auth.py:215 +msgid "An email has been sent with your temporary login key" +msgstr "" + +#: forum/views/auth.py:230 +msgid "" +"You are logged in with a temporary access key, please take the time to fix " +"your issue with authentication." +msgstr "" + +#: forum/views/auth.py:236 +msgid "Email Validation" +msgstr "" + +#: forum/views/auth.py:247 +msgid "Thank you, your email is now validated." +msgstr "" + +#: forum/views/auth.py:271 +msgid "Your password was changed" +msgstr "" + +#: forum/views/auth.py:273 +msgid "New password set" +msgstr "New password created" + +#: forum/views/auth.py:306 +#, python-format +msgid "You removed the association with %s" +msgstr "" + +#: forum/views/auth.py:345 +#, python-format +msgid "Welcome back %s, you are now logged in" +msgstr "" + +#: forum/views/commands.py:209 #, python-format msgid "subscription saved, %(email)s needs validation, see %(details_url)s" 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 "" @@ -3654,76 +3821,76 @@ msgstr "" msgid "We look forward to hearing your feedback! Please, give it next time :)" msgstr "" -#: forum/views/users.py:842 forum/views/users.py:846 +#: forum/views/users.py:851 forum/views/users.py:855 msgid "changes saved" msgstr "" -#: forum/views/users.py:852 +#: forum/views/users.py:861 msgid "email updates canceled" msgstr "" -#: forum/views/users.py:882 +#: forum/views/users.py:891 msgid "user profile" msgstr "" -#: forum/views/users.py:883 +#: forum/views/users.py:892 msgid "user profile overview" msgstr "" -#: forum/views/users.py:890 +#: forum/views/users.py:899 msgid "recent user activity" msgstr "" -#: forum/views/users.py:891 +#: forum/views/users.py:900 msgid "profile - recent activity" msgstr "" -#: forum/views/users.py:900 +#: forum/views/users.py:909 msgid "profile - responses" msgstr "" -#: forum/views/users.py:908 +#: forum/views/users.py:917 msgid "user reputation in the community" msgstr "user karma" -#: forum/views/users.py:909 +#: forum/views/users.py:918 msgid "profile - user reputation" msgstr "Profile - User's Karma" -#: forum/views/users.py:915 +#: forum/views/users.py:924 msgid "favorite questions" msgstr "" -#: forum/views/users.py:916 +#: forum/views/users.py:925 msgid "users favorite questions" msgstr "" -#: forum/views/users.py:917 +#: forum/views/users.py:926 msgid "profile - favorite questions" msgstr "" -#: forum/views/users.py:926 +#: forum/views/users.py:935 msgid "profile - votes" msgstr "" -#: forum/views/users.py:935 +#: forum/views/users.py:944 msgid "profile - email subscriptions" 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" @@ -3734,6 +3901,65 @@ msgstr "" msgid "books/" msgstr "" +#: forum_modules/facebookauth/authentication.py:29 +msgid "Sorry, your Facebook session has expired, please try again" +msgstr "" + +#: forum_modules/facebookauth/authentication.py:31 +msgid "" +"The authentication with Facebook connect failed due to an invalid signature" +msgstr "" + +#: forum_modules/facebookauth/authentication.py:33 +msgid "" +"The authentication with Facebook connect failed, cannot find authentication " +"tokens" +msgstr "" + +#: forum_modules/localauth/urls.py:7 +msgid "local/" +msgstr "" + +#: forum_modules/localauth/views.py:23 +msgid "A validation email has been sent to your email address. " +msgstr "" + +#: forum_modules/oauthauth/consumer.py:33 +msgid "Error, the oauth token is not on the server" +msgstr "" + +#: forum_modules/oauthauth/consumer.py:38 +msgid "Something went wrong! Auth tokens do not match" +msgstr "" + +#: forum_modules/openidauth/consumer.py:40 +msgid "Sorry, but your input is not a valid OpenId" +msgstr "" + +#: forum_modules/openidauth/consumer.py:92 +msgid "The OpenId authentication request was canceled" +msgstr "" + +#: forum_modules/openidauth/consumer.py:94 +msgid "The OpenId authentication failed: " +msgstr "" + +#: forum_modules/openidauth/consumer.py:96 +msgid "Setup needed" +msgstr "" + +#: forum_modules/openidauth/consumer.py:98 +msgid "The OpenId authentication failed with an unknown status: " +msgstr "" + +#: forum_modules/openidauth/templates/openidurl.html:7 +msgid "Enter your OpenId Url" +msgstr "" + +#: stackexchange/management/commands/load_stackexchange.py:124 +msgid "Congratulations, you are now an Administrator" +msgstr "" + #~ msgid "" #~ "\n" #~ " have total %(q_num)s unanswered questions\n" |