From 4db17f6d5f07c551a2161898d74aae7208bd0229 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Wed, 12 Aug 2009 15:26:32 -0400 Subject: merged Bruno url translations, removed his local mods, added settings.BOOKS_ON, validated more templates --- locale/en/LC_MESSAGES/django.mo | Bin 13992 -> 14334 bytes locale/en/LC_MESSAGES/django.po | 606 ++++++++++++++++++++++++---------------- 2 files changed, 368 insertions(+), 238 deletions(-) (limited to 'locale/en/LC_MESSAGES') diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index 11d15deb..447afac4 100644 Binary files a/locale/en/LC_MESSAGES/django.mo and b/locale/en/LC_MESSAGES/django.mo differ diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index 07532566..ff280947 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-05 22:26-0400\n" +"POT-Creation-Date: 2009-08-12 15:41+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,16 +16,145 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: settings.py:12 +#: settings.py:12 urls.py:25 forum/views.py:304 forum/views.py:698 msgid "account/" msgstr "" -#: settings.py:12 django_authopenid/urls.py:9 django_authopenid/urls.py:10 -#: django_authopenid/urls.py:11 django_authopenid/urls.py:13 -#: forum/views.py:304 templates/authopenid/confirm_email.txt:10 +#: settings.py:12 urls.py:26 django_authopenid/urls.py:9 +#: django_authopenid/urls.py:10 django_authopenid/urls.py:11 +#: django_authopenid/urls.py:13 forum/views.py:304 forum/views.py:699 +#: templates/authopenid/confirm_email.txt:10 msgid "signin/" msgstr "" +#: urls.py:22 +msgid "upfiles/" +msgstr "" + +#: urls.py:27 urls.py:28 urls.py:29 django_authopenid/urls.py:26 +#: django_authopenid/urls.py:27 +msgid "email/" +msgstr "" + +#: urls.py:27 +msgid "change/" +msgstr "" + +#: urls.py:28 +msgid "sendkey/" +msgstr "" + +#: urls.py:29 +msgid "verify/" +msgstr "" + +#: urls.py:30 +msgid "about/" +msgstr "" + +#: urls.py:31 +msgid "faq/" +msgstr "" + +#: urls.py:32 +msgid "privacy/" +msgstr "" + +#: urls.py:33 +msgid "logout/" +msgstr "" + +#: urls.py:34 urls.py:35 urls.py:36 urls.py:48 forum/models.py:418 +msgid "answers/" +msgstr "" + +#: urls.py:34 urls.py:46 +msgid "comments/" +msgstr "" + +#: urls.py:35 urls.py:40 urls.py:54 templates/user_info.html:34 +msgid "edit/" +msgstr "" + +#: urls.py:36 urls.py:45 +msgid "revisions/" +msgstr "" + +#: urls.py:37 urls.py:38 urls.py:39 urls.py:40 urls.py:41 urls.py:42 +#: urls.py:43 urls.py:44 urls.py:45 urls.py:46 urls.py:47 forum/feed.py:19 +#: forum/models.py:306 forum/views.py:1416 +msgid "questions/" +msgstr "" + +#: urls.py:38 urls.py:64 +msgid "ask/" +msgstr "" + +#: urls.py:39 +msgid "unanswered/" +msgstr "" + +#: urls.py:41 +msgid "close/" +msgstr "" + +#: urls.py:42 +msgid "reopen/" +msgstr "" + +#: urls.py:43 +msgid "answer/" +msgstr "" + +#: urls.py:44 +msgid "vote/" +msgstr "" + +#: urls.py:47 urls.py:48 django_authopenid/urls.py:29 +msgid "delete/" +msgstr "" + +#: urls.py:50 +msgid "question/" +msgstr "" + +#: urls.py:51 urls.py:52 forum/views.py:740 forum/views.py:2013 +msgid "tags/" +msgstr "" + +#: urls.py:53 urls.py:54 urls.py:55 forum/views.py:993 forum/views.py:997 +#: forum/views.py:1418 forum/views.py:1751 forum/views.py:2015 +msgid "users/" +msgstr "" + +#: urls.py:56 urls.py:57 +msgid "badges/" +msgstr "" + +#: urls.py:58 +msgid "messages/" +msgstr "" + +#: urls.py:58 +msgid "markread/" +msgstr "" + +#: urls.py:60 +msgid "nimda/" +msgstr "" + +#: urls.py:62 +msgid "upload/" +msgstr "" + +#: urls.py:63 urls.py:64 urls.py:65 +msgid "books/" +msgstr "" + +#: urls.py:66 +msgid "search/" +msgstr "" + #: django_authopenid/forms.py:67 django_authopenid/views.py:102 msgid "i-names are not supported" msgstr "" @@ -109,7 +238,7 @@ msgstr "" msgid "Incorrect username." msgstr "" -#: django_authopenid/urls.py:10 +#: django_authopenid/urls.py:10 forum/views.py:304 forum/views.py:699 msgid "newquestion/" msgstr "" @@ -137,8 +266,8 @@ msgstr "" msgid "sendpw/" msgstr "" -#: django_authopenid/urls.py:29 -msgid "delete/" +#: django_authopenid/urls.py:27 +msgid "validate/" msgstr "" #: django_authopenid/views.py:108 @@ -146,69 +275,69 @@ msgstr "" msgid "OpenID %(openid_url)s is invalid" msgstr "" -#: django_authopenid/views.py:417 django_authopenid/views.py:544 +#: django_authopenid/views.py:418 django_authopenid/views.py:545 msgid "Welcome" msgstr "Verification Email from Q&A forum" -#: django_authopenid/views.py:507 +#: django_authopenid/views.py:508 msgid "Password changed." msgstr "" -#: django_authopenid/views.py:519 django_authopenid/views.py:524 +#: django_authopenid/views.py:520 django_authopenid/views.py:525 msgid "your email needs to be validated" msgstr "" "Your email needs to be validated. Please see details here." -#: django_authopenid/views.py:681 django_authopenid/views.py:833 +#: django_authopenid/views.py:682 django_authopenid/views.py:834 #, python-format msgid "No OpenID %s found associated in our database" msgstr "" -#: django_authopenid/views.py:685 django_authopenid/views.py:840 +#: django_authopenid/views.py:686 django_authopenid/views.py:841 #, python-format msgid "The OpenID %s isn't associated to current user logged in" msgstr "" -#: django_authopenid/views.py:693 +#: django_authopenid/views.py:694 msgid "Email Changed." msgstr "" -#: django_authopenid/views.py:768 +#: django_authopenid/views.py:769 msgid "This OpenID is already associated with another account." msgstr "" -#: django_authopenid/views.py:773 +#: django_authopenid/views.py:774 #, python-format msgid "OpenID %s is now associated with your account." msgstr "" -#: django_authopenid/views.py:843 +#: django_authopenid/views.py:844 msgid "Account deleted." msgstr "" -#: django_authopenid/views.py:883 +#: django_authopenid/views.py:884 msgid "Request for new password" msgstr "" -#: django_authopenid/views.py:896 +#: django_authopenid/views.py:897 msgid "A new password has been sent to your email address." msgstr "" -#: django_authopenid/views.py:926 +#: django_authopenid/views.py:927 #, python-format msgid "" "Could not change password. Confirmation key '%s' is not " "registered." msgstr "" -#: django_authopenid/views.py:935 +#: django_authopenid/views.py:936 msgid "" "Can not change password. User don't exist anymore in our " "database." msgstr "" -#: django_authopenid/views.py:944 +#: django_authopenid/views.py:945 #, python-format msgid "Password changed for %s. You may now sign in." msgstr "" @@ -337,12 +466,8 @@ msgstr "" msgid "latest questions" msgstr "" -#: forum/feed.py:19 -msgid "questions/" -msgstr "" - -#: forum/forms.py:14 templates/answer_edit_tips.html:34 -#: templates/answer_edit_tips.html.py:38 templates/question_edit_tips.html:31 +#: forum/forms.py:14 templates/answer_edit_tips.html:33 +#: templates/answer_edit_tips.html.py:37 templates/question_edit_tips.html:31 #: templates/question_edit_tips.html:36 msgid "title" msgstr "" @@ -363,7 +488,7 @@ msgstr "" msgid "question content must be > 10 characters" msgstr "" -#: forum/forms.py:45 templates/header.html:30 templates/header.html.py:61 +#: forum/forms.py:45 templates/header.html:30 templates/header.html.py:64 msgid "tags" msgstr "" @@ -390,8 +515,8 @@ msgid "" "characters '.-_#'" msgstr "" -#: forum/forms.py:75 templates/index.html:57 templates/question.html:199 -#: templates/question.html.py:380 templates/questions.html:58 +#: forum/forms.py:75 templates/index.html:57 templates/question.html:209 +#: templates/question.html.py:395 templates/questions.html:58 #: templates/questions.html.py:70 templates/unanswered.html:48 #: templates/unanswered.html.py:60 msgid "community wiki" @@ -445,40 +570,44 @@ msgstr "" msgid "this email has already been registered, please use another one" msgstr "" -#: forum/models.py:238 +#: forum/models.py:246 #, python-format msgid "%(author)s modified the question" msgstr "" -#: forum/models.py:242 +#: forum/models.py:250 #, python-format msgid "%(people)s posted %(new_answer_count)s new answers" msgstr "" -#: forum/models.py:247 +#: forum/models.py:255 #, python-format msgid "%(people)s commented the question" msgstr "" -#: forum/models.py:252 +#: forum/models.py:260 #, python-format msgid "%(people)s commented answers" msgstr "" -#: forum/models.py:254 +#: forum/models.py:262 #, python-format -msgid "%(people)s commented the answer" +msgid "%(people)s commented an answer" msgstr "" -#: forum/models.py:433 templates/badges.html:52 +#: forum/models.py:306 forum/models.py:418 +msgid "revisions" +msgstr "" + +#: forum/models.py:441 templates/badges.html:51 msgid "gold" msgstr "" -#: forum/models.py:434 templates/badges.html:60 +#: forum/models.py:442 templates/badges.html:59 msgid "silver" msgstr "" -#: forum/models.py:435 templates/badges.html:67 +#: forum/models.py:443 templates/badges.html:66 msgid "bronze" msgstr "" @@ -566,31 +695,27 @@ msgstr "" msgid "profile - user preferences" msgstr "" -#: forum/views.py:304 -msgid "/account/" -msgstr "" - -#: forum/views.py:943 +#: forum/views.py:947 #, python-format msgid "subscription saved, %(email)s needs validation" msgstr "" "Your subscription is saved, but email address %(email)s needs to be " "validated, please see more details here" -#: forum/views.py:1853 +#: forum/views.py:1860 msgid "uploading images is limited to users with >60 reputation points" msgstr "" -#: forum/views.py:1855 +#: forum/views.py:1862 msgid "allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'" msgstr "" -#: forum/views.py:1857 +#: forum/views.py:1864 #, python-format msgid "maximum upload file size is %sK" msgstr "" -#: forum/views.py:1859 +#: forum/views.py:1866 #, python-format msgid "" "Error uploading file. Please contact the site administrator. Thank you. %s" @@ -600,16 +725,16 @@ msgstr "" msgid "updates from website" msgstr "" -#: forum/templatetags/extra_tags.py:139 forum/templatetags/extra_tags.py:168 -#: templates/header.html:33 +#: forum/templatetags/extra_tags.py:143 forum/templatetags/extra_tags.py:172 +#: templates/header.html:35 msgid "badges" msgstr "" -#: forum/templatetags/extra_tags.py:140 forum/templatetags/extra_tags.py:167 +#: forum/templatetags/extra_tags.py:144 forum/templatetags/extra_tags.py:171 msgid "reputation points" msgstr "" -#: forum/templatetags/extra_tags.py:221 +#: forum/templatetags/extra_tags.py:225 msgid " ago" msgstr "" @@ -684,13 +809,13 @@ msgid "Edit answer" msgstr "" #: templates/answer_edit.html:24 templates/answer_edit.html.py:27 -#: templates/ask.html:25 templates/ask.html.py:28 templates/question.html:40 -#: templates/question.html.py:43 templates/question_edit.html:27 +#: templates/ask.html:25 templates/ask.html.py:28 templates/question.html:43 +#: templates/question.html.py:46 templates/question_edit.html:27 msgid "hide preview" msgstr "" #: templates/answer_edit.html:27 templates/ask.html:28 -#: templates/question.html:43 templates/question_edit.html:27 +#: templates/question.html:46 templates/question_edit.html:27 msgid "show preview" msgstr "" @@ -710,22 +835,22 @@ msgid "select revision" msgstr "" #: templates/answer_edit.html:62 templates/ask.html:94 -#: templates/question.html:452 templates/question_edit.html:91 +#: templates/question.html:467 templates/question_edit.html:91 msgid "Toggle the real time Markdown editor preview" msgstr "" #: templates/answer_edit.html:62 templates/ask.html:94 -#: templates/question.html:452 templates/question_edit.html:91 +#: templates/question.html:467 templates/question_edit.html:91 msgid "toggle preview" msgstr "" -#: templates/answer_edit.html:73 templates/question_edit.html:119 -#: templates/question_retag.html:75 +#: templates/answer_edit.html:71 templates/question_edit.html:115 +#: templates/question_retag.html:73 msgid "Save edit" msgstr "" -#: templates/answer_edit.html:74 templates/close.html:29 -#: templates/question_edit.html:120 templates/question_retag.html:76 +#: templates/answer_edit.html:72 templates/close.html:29 +#: templates/question_edit.html:116 templates/question_retag.html:74 #: templates/reopen.html:30 templates/user_edit.html:83 #: templates/authopenid/changeemail.html:34 msgid "Cancel" @@ -755,40 +880,40 @@ msgstr "" msgid "see frequently asked questions" msgstr "" -#: templates/answer_edit_tips.html:25 templates/question_edit_tips.html:22 +#: templates/answer_edit_tips.html:24 templates/question_edit_tips.html:22 msgid "Markdown tips" msgstr "Markdown basics" -#: templates/answer_edit_tips.html:28 templates/question_edit_tips.html:25 +#: templates/answer_edit_tips.html:27 templates/question_edit_tips.html:25 msgid "*italic* or __italic__" msgstr "" -#: templates/answer_edit_tips.html:31 templates/question_edit_tips.html:28 +#: templates/answer_edit_tips.html:30 templates/question_edit_tips.html:28 msgid "**bold** or __bold__" msgstr "" -#: templates/answer_edit_tips.html:34 templates/question_edit_tips.html:31 +#: templates/answer_edit_tips.html:33 templates/question_edit_tips.html:31 msgid "link" msgstr "" -#: templates/answer_edit_tips.html:34 templates/answer_edit_tips.html.py:38 +#: templates/answer_edit_tips.html:33 templates/answer_edit_tips.html.py:37 #: templates/question_edit_tips.html:31 templates/question_edit_tips.html:36 msgid "text" msgstr "" -#: templates/answer_edit_tips.html:38 templates/question_edit_tips.html:36 +#: templates/answer_edit_tips.html:37 templates/question_edit_tips.html:36 msgid "image" msgstr "" -#: templates/answer_edit_tips.html:42 templates/question_edit_tips.html:40 +#: templates/answer_edit_tips.html:41 templates/question_edit_tips.html:40 msgid "numbered list:" msgstr "" -#: templates/answer_edit_tips.html:47 templates/question_edit_tips.html:45 +#: templates/answer_edit_tips.html:46 templates/question_edit_tips.html:45 msgid "basic HTML tags are also supported" msgstr "" -#: templates/answer_edit_tips.html:50 templates/question_edit_tips.html:48 +#: templates/answer_edit_tips.html:49 templates/question_edit_tips.html:48 msgid "learn more about Markdown" msgstr "" @@ -816,15 +941,15 @@ msgstr "" "your question now and validate email after that. Your question will saved as " "pending meanwhile. " -#: templates/ask.html:108 +#: templates/ask.html:107 msgid "(required)" msgstr "" -#: templates/ask.html:115 +#: templates/ask.html:114 msgid "Login/signup to post your question" msgstr "Login/Signup to Post" -#: templates/ask.html:117 +#: templates/ask.html:116 msgid "Ask your question" msgstr "Ask Your Question" @@ -840,7 +965,7 @@ msgstr "" msgid "Badges summary" msgstr "" -#: templates/badges.html:17 templates/user_stats.html:113 +#: templates/badges.html:17 templates/user_stats.html:115 msgid "Badges" msgstr "" @@ -862,27 +987,27 @@ msgstr "" "a> - what kinds of badges would you like to see and suggest the " "activity for which those badges might be awarded." -#: templates/badges.html:49 +#: templates/badges.html:48 msgid "Community badges" msgstr "Badge levels" -#: templates/badges.html:55 +#: templates/badges.html:54 msgid "gold badge description" msgstr "" "Gold badge is the highest award in this community. To obtain it have to show " "profound knowledge and ability in addition to your active participation." -#: templates/badges.html:63 +#: templates/badges.html:62 msgid "silver badge description" msgstr "" "Obtaining silver badge requires significant patience. If you have received " "one, that means you have greatly contributed to this community." -#: templates/badges.html:66 +#: templates/badges.html:65 msgid "bronze badge: often given as a special honor" msgstr "" -#: templates/badges.html:70 +#: templates/badges.html:69 msgid "bronze badge description" msgstr "" "If you are an active participant in this community, you will be recognized " @@ -968,11 +1093,10 @@ msgstr "" msgid "views" msgstr "" -#: templates/book.html:125 templates/index.html:69 templates/question.html:115 -#: templates/question.html.py:486 templates/questions.html:84 -#: templates/questions.html.py:156 templates/tags.html:47 -#: templates/unanswered.html:75 templates/unanswered.html.py:109 -#: templates/users_questions.html:52 +#: templates/book.html:125 templates/index.html:69 templates/question.html:499 +#: templates/questions.html:84 templates/questions.html.py:156 +#: templates/tags.html:49 templates/unanswered.html:75 +#: templates/unanswered.html.py:106 templates/users_questions.html:52 msgid "using tags" msgstr "" @@ -980,7 +1104,7 @@ msgstr "" msgid "subscribe to book RSS feed" msgstr "" -#: templates/book.html:147 templates/index.html:116 +#: templates/book.html:147 templates/index.html:118 msgid "subscribe to the questions feed" msgstr "" @@ -1036,10 +1160,6 @@ msgstr "" msgid "What should I avoid in my answers?" msgstr "" -#: templates/faq.html:28 templates/faq.html.py:132 -msgid "site title" -msgstr "" - #: templates/faq.html:28 msgid "" "is a Q&A site, not a discussion group. Therefore - please avoid having " @@ -1081,61 +1201,72 @@ msgstr "" "rough measure of the community trust to him/her. Various moderation tasks " "are gradually assigned to the users based on those points." -#: templates/faq.html:59 templates/user_votes.html:14 +#: templates/faq.html:42 +msgid "" +"For example, if you ask an interesting question or give a helpful answer, " +"your input will be upvoted. On the other hand if the answer is misleading - " +"it will be downvoted. Each vote in favor will generate 10 " +"points, each vote against will subtract 2 points. There is " +"a limit of 200 points that can be accumulated per question " +"or answer. The table below explains reputation point requirements for each " +"type of moderation task." +msgstr "" + +#: templates/faq.html:53 templates/user_votes.html:14 msgid "upvote" msgstr "" -#: templates/faq.html:63 +#: templates/faq.html:57 msgid "use tags" msgstr "" -#: templates/faq.html:68 +#: templates/faq.html:62 msgid "add comments" msgstr "" -#: templates/faq.html:72 templates/user_votes.html:16 +#: templates/faq.html:66 templates/user_votes.html:16 msgid "downvote" msgstr "" -#: templates/faq.html:75 +#: templates/faq.html:69 msgid "open and close own questions" msgstr "" -#: templates/faq.html:79 +#: templates/faq.html:73 msgid "retag questions" msgstr "" -#: templates/faq.html:83 +#: templates/faq.html:77 msgid "edit community wiki questions" msgstr "" -#: templates/faq.html:87 +#: templates/faq.html:81 msgid "edit any answer" msgstr "" -#: templates/faq.html:91 +#: templates/faq.html:85 msgid "open any closed question" msgstr "" -#: templates/faq.html:95 +#: templates/faq.html:89 msgid "delete any comment" msgstr "" -#: templates/faq.html:99 +#: templates/faq.html:93 msgid "delete any questions and answers and perform other moderation tasks" msgstr "" -#: templates/faq.html:106 +#: templates/faq.html:100 msgid "how to validate email title" msgstr "How to validate email and why?" -#: templates/faq.html:108 +#: templates/faq.html:102 msgid "how to validate email info" msgstr "" "

How? If you have just set or changed your email " -"address - check your email and click the included link." -"
The link contains a key generated specifically for you. You can also " +"address - check your email and click the included link.
The link contains a key generated specifically for you. You can also " "