diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-03-11 23:48:28 -0400 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-03-11 23:48:28 -0400 |
| commit | f8a1d9d49d98bffb77d945314550c1b80841576d (patch) | |
| tree | c2b03d658b69260551332de87e9e61e6632b795e | |
| parent | 420cae564a7f3d4225c660b8743929fee542c6c6 (diff) | |
| download | askbot-f8a1d9d49d98bffb77d945314550c1b80841576d.tar.gz askbot-f8a1d9d49d98bffb77d945314550c1b80841576d.tar.bz2 askbot-f8a1d9d49d98bffb77d945314550c1b80841576d.zip | |
rebuilt four locales again
| -rw-r--r-- | askbot/locale/en/LC_MESSAGES/django.po | 939 | ||||
| -rw-r--r-- | askbot/locale/es/LC_MESSAGES/django.po | 264 | ||||
| -rw-r--r-- | askbot/locale/hi/LC_MESSAGES/django.po | 2175 | ||||
| -rw-r--r-- | askbot/locale/ru/LC_MESSAGES/django.po | 258 | ||||
| -rw-r--r-- | askbot/skins/default/templates/macros.html | 2 |
5 files changed, 1856 insertions, 1782 deletions
diff --git a/askbot/locale/en/LC_MESSAGES/django.po b/askbot/locale/en/LC_MESSAGES/django.po index 2558d807..60d012fb 100644 --- a/askbot/locale/en/LC_MESSAGES/django.po +++ b/askbot/locale/en/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-25 18:59-0600\n" +"POT-Creation-Date: 2012-03-11 22:40-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Evgeny Fadeev <evgeny.fadeev@gmail.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -56,34 +56,34 @@ msgstr "" msgid "please enter a descriptive title for your question" msgstr "" -#: forms.py:111 +#: forms.py:113 #, python-format msgid "title must be > %d character" msgid_plural "title must be > %d characters" msgstr[0] "" msgstr[1] "" -#: forms.py:121 +#: forms.py:123 #, python-format msgid "The title is too long, maximum allowed size is %d characters" msgstr "" -#: forms.py:128 +#: forms.py:130 #, python-format msgid "The title is too long, maximum allowed size is %d bytes" msgstr "" -#: forms.py:147 +#: forms.py:149 msgid "content" msgstr "" -#: forms.py:181 skins/common/templates/widgets/edit_post.html:20 +#: forms.py:185 skins/common/templates/widgets/edit_post.html:20 #: skins/common/templates/widgets/edit_post.html:32 #: skins/default/templates/widgets/meta_nav.html:5 msgid "tags" msgstr "" -#: forms.py:184 +#: forms.py:188 #, python-format msgid "" "Tags are short keywords, with no spaces within. Up to %(max_tags)d tag can " @@ -94,240 +94,240 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: forms.py:217 skins/default/templates/question_retag.html:58 +#: forms.py:221 skins/default/templates/question_retag.html:58 msgid "tags are required" msgstr "" -#: forms.py:226 +#: forms.py:230 #, python-format msgid "please use %(tag_count)d tag or less" msgid_plural "please use %(tag_count)d tags or less" msgstr[0] "" msgstr[1] "" -#: forms.py:234 +#: forms.py:238 #, python-format msgid "At least one of the following tags is required : %(tags)s" msgstr "" -#: forms.py:243 +#: forms.py:247 #, python-format msgid "each tag must be shorter than %(max_chars)d character" msgid_plural "each tag must be shorter than %(max_chars)d characters" msgstr[0] "" msgstr[1] "" -#: forms.py:251 -msgid "use-these-chars-in-tags" +#: forms.py:256 +msgid "In tags, please use letters, numbers and characters \"-+.#\"" msgstr "" -#: forms.py:286 +#: forms.py:292 msgid "community wiki (karma is not awarded & many others can edit wiki post)" msgstr "" -#: forms.py:287 +#: forms.py:293 msgid "" "if you choose community wiki option, the question and answer do not generate " "points and name of author will not be shown" msgstr "" -#: forms.py:303 +#: forms.py:309 msgid "update summary:" msgstr "" -#: forms.py:304 +#: forms.py:310 msgid "" "enter a brief summary of your revision (e.g. fixed spelling, grammar, " "improved style, this field is optional)" msgstr "" -#: forms.py:378 +#: forms.py:384 msgid "Enter number of points to add or subtract" msgstr "" -#: forms.py:392 const/__init__.py:247 +#: forms.py:398 const/__init__.py:253 msgid "approved" msgstr "" -#: forms.py:393 const/__init__.py:248 +#: forms.py:399 const/__init__.py:254 msgid "watched" msgstr "" -#: forms.py:394 const/__init__.py:249 +#: forms.py:400 const/__init__.py:255 msgid "suspended" msgstr "" -#: forms.py:395 const/__init__.py:250 +#: forms.py:401 const/__init__.py:256 msgid "blocked" msgstr "" -#: forms.py:397 +#: forms.py:403 msgid "administrator" msgstr "" -#: forms.py:398 const/__init__.py:246 +#: forms.py:404 const/__init__.py:252 msgid "moderator" msgstr "" -#: forms.py:418 +#: forms.py:424 msgid "Change status to" msgstr "" -#: forms.py:445 +#: forms.py:451 msgid "which one?" msgstr "" -#: forms.py:466 +#: forms.py:472 msgid "Cannot change own status" msgstr "" -#: forms.py:472 +#: forms.py:478 msgid "Cannot turn other user to moderator" msgstr "" -#: forms.py:479 +#: forms.py:485 msgid "Cannot change status of another moderator" msgstr "" -#: forms.py:485 +#: forms.py:491 msgid "Cannot change status to admin" msgstr "" -#: forms.py:491 +#: forms.py:497 #, python-format msgid "" "If you wish to change %(username)s's status, please make a meaningful " "selection." msgstr "" -#: forms.py:500 +#: forms.py:506 msgid "Subject line" msgstr "" -#: forms.py:507 +#: forms.py:513 msgid "Message text" msgstr "" -#: forms.py:522 +#: forms.py:528 msgid "Your name (optional):" msgstr "" -#: forms.py:523 +#: forms.py:529 msgid "Email:" msgstr "" -#: forms.py:525 +#: forms.py:531 msgid "Your message:" msgstr "" -#: forms.py:530 +#: forms.py:536 msgid "I don't want to give my email or receive a response:" msgstr "" -#: forms.py:552 +#: forms.py:558 msgid "Please mark \"I dont want to give my mail\" field." msgstr "" -#: forms.py:591 +#: forms.py:597 msgid "ask anonymously" msgstr "" -#: forms.py:593 +#: forms.py:599 msgid "Check if you do not want to reveal your name when asking this question" msgstr "" -#: forms.py:753 +#: forms.py:752 msgid "" "You have asked this question anonymously, if you decide to reveal your " "identity, please check this box." msgstr "" -#: forms.py:757 +#: forms.py:756 msgid "reveal identity" msgstr "" -#: forms.py:815 +#: forms.py:814 msgid "" "Sorry, only owner of the anonymous question can reveal his or her identity, " "please uncheck the box" msgstr "" -#: forms.py:828 +#: forms.py:827 msgid "" "Sorry, apparently rules have just changed - it is no longer possible to ask " "anonymously. Please either check the \"reveal identity\" box or reload this " "page and try editing the question again." msgstr "" -#: forms.py:872 +#: forms.py:871 msgid "Real name" msgstr "" -#: forms.py:879 +#: forms.py:878 msgid "Website" msgstr "" -#: forms.py:886 +#: forms.py:885 msgid "City" msgstr "" -#: forms.py:895 +#: forms.py:894 msgid "Show country" msgstr "" -#: forms.py:900 +#: forms.py:899 msgid "Date of birth" msgstr "" -#: forms.py:901 +#: forms.py:900 msgid "will not be shown, used to calculate age, format: YYYY-MM-DD" msgstr "" -#: forms.py:907 +#: forms.py:906 msgid "Profile" msgstr "" -#: forms.py:916 +#: forms.py:915 msgid "Screen name" msgstr "" -#: forms.py:947 forms.py:948 +#: forms.py:946 forms.py:947 msgid "this email has already been registered, please use another one" msgstr "" -#: forms.py:955 +#: forms.py:954 msgid "Choose email tag filter" msgstr "" -#: forms.py:1002 +#: forms.py:1001 msgid "Asked by me" msgstr "" -#: forms.py:1005 +#: forms.py:1004 msgid "Answered by me" msgstr "" -#: forms.py:1008 +#: forms.py:1007 msgid "Individually selected" msgstr "" -#: forms.py:1011 +#: forms.py:1010 msgid "Entire forum (tag filtered)" msgstr "" -#: forms.py:1015 +#: forms.py:1014 msgid "Comments and posts mentioning me" msgstr "" -#: forms.py:1096 +#: forms.py:1095 msgid "please choose one of the options above" msgstr "" -#: forms.py:1099 +#: forms.py:1098 msgid "okay, let's try!" msgstr "" -#: forms.py:1102 +#: forms.py:1101 #, python-format msgid "no %(sitename)s email please, thanks" msgstr "" @@ -569,146 +569,150 @@ msgid "" msgstr "" #: conf/email.py:38 +msgid "Enable email alerts" +msgstr "" + +#: conf/email.py:47 msgid "Maximum number of news entries in an email alert" msgstr "" -#: conf/email.py:48 +#: conf/email.py:57 msgid "Default notification frequency all questions" msgstr "" -#: conf/email.py:50 +#: conf/email.py:59 msgid "Option to define frequency of emailed updates for: all questions." msgstr "" -#: conf/email.py:62 +#: conf/email.py:71 msgid "Default notification frequency questions asked by the user" msgstr "" -#: conf/email.py:64 +#: conf/email.py:73 msgid "" "Option to define frequency of emailed updates for: Question asked by the " "user." msgstr "" -#: conf/email.py:76 +#: conf/email.py:85 msgid "Default notification frequency questions answered by the user" msgstr "" -#: conf/email.py:78 +#: conf/email.py:87 msgid "" "Option to define frequency of emailed updates for: Question answered by the " "user." msgstr "" -#: conf/email.py:90 +#: conf/email.py:99 msgid "" "Default notification frequency questions individually " "selected by the user" msgstr "" -#: conf/email.py:93 +#: conf/email.py:102 msgid "" "Option to define frequency of emailed updates for: Question individually " "selected by the user." msgstr "" -#: conf/email.py:105 +#: conf/email.py:114 msgid "" "Default notification frequency for mentions and " "comments" msgstr "" -#: conf/email.py:108 +#: conf/email.py:117 msgid "" "Option to define frequency of emailed updates for: Mentions and comments." msgstr "" -#: conf/email.py:119 +#: conf/email.py:128 msgid "Send periodic reminders about unanswered questions" msgstr "" -#: conf/email.py:121 +#: conf/email.py:130 msgid "" "NOTE: in order to use this feature, it is necessary to run the management " "command \"send_unanswered_question_reminders\" (for example, via a cron job " "- with an appropriate frequency) " msgstr "" -#: conf/email.py:134 +#: conf/email.py:143 msgid "Days before starting to send reminders about unanswered questions" msgstr "" -#: conf/email.py:145 +#: conf/email.py:154 msgid "" "How often to send unanswered question reminders (in days between the " "reminders sent)." msgstr "" -#: conf/email.py:157 +#: conf/email.py:166 msgid "Max. number of reminders to send about unanswered questions" msgstr "" -#: conf/email.py:168 +#: conf/email.py:177 msgid "Send periodic reminders to accept the best answer" msgstr "" -#: conf/email.py:170 +#: conf/email.py:179 msgid "" "NOTE: in order to use this feature, it is necessary to run the management " "command \"send_accept_answer_reminders\" (for example, via a cron job - with " "an appropriate frequency) " msgstr "" -#: conf/email.py:183 +#: conf/email.py:192 msgid "Days before starting to send reminders to accept an answer" msgstr "" -#: conf/email.py:194 +#: conf/email.py:203 msgid "" "How often to send accept answer reminders (in days between the reminders " "sent)." msgstr "" -#: conf/email.py:206 +#: conf/email.py:215 msgid "Max. number of reminders to send to accept the best answer" msgstr "" -#: conf/email.py:218 +#: conf/email.py:227 msgid "Require email verification before allowing to post" msgstr "" -#: conf/email.py:219 +#: conf/email.py:228 msgid "" "Active email verification is done by sending a verification key in email" msgstr "" -#: conf/email.py:228 +#: conf/email.py:237 msgid "Allow only one account per email address" msgstr "" -#: conf/email.py:237 +#: conf/email.py:246 msgid "Fake email for anonymous user" msgstr "" -#: conf/email.py:238 +#: conf/email.py:247 msgid "Use this setting to control gravatar for email-less user" msgstr "" -#: conf/email.py:247 +#: conf/email.py:256 msgid "Allow posting questions by email" msgstr "" -#: conf/email.py:249 +#: conf/email.py:258 msgid "" "Before enabling this setting - please fill out IMAP settings in the settings." "py file" msgstr "" -#: conf/email.py:260 +#: conf/email.py:269 msgid "Replace space in emailed tags with dash" msgstr "" -#: conf/email.py:262 +#: conf/email.py:271 msgid "" "This setting applies to tags written in the subject line of questions asked " "by email" @@ -744,15 +748,15 @@ msgstr "" msgid "Enable recaptcha (keys below are required)" msgstr "" -#: conf/external_keys.py:60 +#: conf/external_keys.py:62 msgid "Recaptcha public key" msgstr "" -#: conf/external_keys.py:68 +#: conf/external_keys.py:70 msgid "Recaptcha private key" msgstr "" -#: conf/external_keys.py:70 +#: conf/external_keys.py:72 #, python-format msgid "" "Recaptcha is a tool that helps distinguish real people from annoying spam " @@ -760,11 +764,11 @@ msgid "" "a>" msgstr "" -#: conf/external_keys.py:82 +#: conf/external_keys.py:84 msgid "Facebook public API key" msgstr "" -#: conf/external_keys.py:84 +#: conf/external_keys.py:86 #, python-format msgid "" "Facebook API key and Facebook secret allow to use Facebook Connect login " @@ -772,70 +776,54 @@ msgid "" "\">facebook create app</a> site" msgstr "" -#: conf/external_keys.py:97 +#: conf/external_keys.py:99 msgid "Facebook secret key" msgstr "" -#: conf/external_keys.py:105 +#: conf/external_keys.py:107 msgid "Twitter consumer key" msgstr "" -#: conf/external_keys.py:107 +#: conf/external_keys.py:109 #, python-format msgid "" "Please register your forum at <a href=\"%(url)s\">twitter applications site</" "a>" msgstr "" -#: conf/external_keys.py:118 +#: conf/external_keys.py:120 msgid "Twitter consumer secret" msgstr "" -#: conf/external_keys.py:126 +#: conf/external_keys.py:128 msgid "LinkedIn consumer key" msgstr "" -#: conf/external_keys.py:128 +#: conf/external_keys.py:130 #, python-format msgid "" "Please register your forum at <a href=\"%(url)s\">LinkedIn developer site</a>" msgstr "" -#: conf/external_keys.py:139 +#: conf/external_keys.py:141 msgid "LinkedIn consumer secret" msgstr "" -#: conf/external_keys.py:147 +#: conf/external_keys.py:149 msgid "ident.ca consumer key" msgstr "" -#: conf/external_keys.py:149 +#: conf/external_keys.py:151 #, python-format msgid "" "Please register your forum at <a href=\"%(url)s\">Identi.ca applications " "site</a>" msgstr "" -#: conf/external_keys.py:160 +#: conf/external_keys.py:162 msgid "ident.ca consumer secret" msgstr "" -#: conf/external_keys.py:168 -msgid "Use LDAP authentication for the password login" -msgstr "" - -#: conf/external_keys.py:177 -msgid "LDAP service provider name" -msgstr "" - -#: conf/external_keys.py:185 -msgid "URL for the LDAP service" -msgstr "" - -#: conf/external_keys.py:193 -msgid "Explain how to change LDAP password" -msgstr "" - #: conf/flatpages.py:11 msgid "Flatpages - about, privacy policy, etc." msgstr "" @@ -1033,6 +1021,38 @@ msgstr "" msgid "What should \"unanswered question\" mean?" msgstr "" +#: conf/ldap.py:9 +msgid "LDAP login configuration" +msgstr "" + +#: conf/ldap.py:17 +msgid "Use LDAP authentication for the password login" +msgstr "" + +#: conf/ldap.py:26 +msgid "LDAP URL" +msgstr "" + +#: conf/ldap.py:35 +msgid "LDAP BASE DN" +msgstr "" + +#: conf/ldap.py:43 +msgid "LDAP Search Scope" +msgstr "" + +#: conf/ldap.py:52 +msgid "LDAP Server USERID field name" +msgstr "" + +#: conf/ldap.py:61 +msgid "LDAP Server \"Common Name\" field name" +msgstr "" + +#: conf/ldap.py:70 +msgid "LDAP Server EMAIL field name" +msgstr "" + #: conf/leading_sidebar.py:12 msgid "Common left sidebar" msgstr "" @@ -1497,27 +1517,27 @@ msgstr "" msgid "Short name for your Q&A forum" msgstr "" -#: conf/site_settings.py:68 +#: conf/site_settings.py:67 msgid "Base URL for your Q&A forum, must start with http or https" msgstr "" -#: conf/site_settings.py:79 +#: conf/site_settings.py:78 msgid "Check to enable greeting for anonymous user" msgstr "" -#: conf/site_settings.py:90 +#: conf/site_settings.py:89 msgid "Text shown in the greeting message shown to the anonymous user" msgstr "" -#: conf/site_settings.py:94 +#: conf/site_settings.py:93 msgid "Use HTML to format the message " msgstr "" -#: conf/site_settings.py:103 +#: conf/site_settings.py:102 msgid "Feedback site URL" msgstr "" -#: conf/site_settings.py:105 +#: conf/site_settings.py:104 msgid "If left empty, a simple internal feedback form will be used instead" msgstr "" @@ -2033,252 +2053,252 @@ msgstr "" msgid "too localized" msgstr "" -#: const/__init__.py:41 +#: const/__init__.py:43 #: skins/default/templates/question/answer_tab_bar.html:18 msgid "newest" msgstr "" -#: const/__init__.py:42 skins/default/templates/users.html:27 +#: const/__init__.py:44 skins/default/templates/users.html:27 #: skins/default/templates/question/answer_tab_bar.html:15 msgid "oldest" msgstr "" -#: const/__init__.py:43 +#: const/__init__.py:45 msgid "active" msgstr "" -#: const/__init__.py:44 +#: const/__init__.py:46 msgid "inactive" msgstr "" -#: const/__init__.py:45 +#: const/__init__.py:47 msgid "hottest" msgstr "" -#: const/__init__.py:46 +#: const/__init__.py:48 msgid "coldest" msgstr "" -#: const/__init__.py:47 +#: const/__init__.py:49 #: skins/default/templates/question/answer_tab_bar.html:21 msgid "most voted" msgstr "" -#: const/__init__.py:48 +#: const/__init__.py:50 msgid "least voted" msgstr "" -#: const/__init__.py:49 const/message_keys.py:23 +#: const/__init__.py:51 const/message_keys.py:23 msgid "relevance" msgstr "" -#: const/__init__.py:57 +#: const/__init__.py:63 #: skins/default/templates/user_profile/user_inbox.html:50 #: skins/default/templates/user_profile/user_inbox.html:62 msgid "all" msgstr "" -#: const/__init__.py:58 +#: const/__init__.py:64 msgid "unanswered" msgstr "" -#: const/__init__.py:59 +#: const/__init__.py:65 msgid "favorite" msgstr "" -#: const/__init__.py:64 +#: const/__init__.py:70 msgid "list" msgstr "" -#: const/__init__.py:65 +#: const/__init__.py:71 msgid "cloud" msgstr "" -#: const/__init__.py:73 +#: const/__init__.py:79 msgid "Question has no answers" msgstr "" -#: const/__init__.py:74 +#: const/__init__.py:80 msgid "Question has no accepted answers" msgstr "" -#: const/__init__.py:119 +#: const/__init__.py:125 msgid "asked a question" msgstr "" -#: const/__init__.py:120 +#: const/__init__.py:126 msgid "answered a question" msgstr "" -#: const/__init__.py:121 const/__init__.py:197 +#: const/__init__.py:127 const/__init__.py:203 msgid "commented question" msgstr "" -#: const/__init__.py:122 const/__init__.py:198 +#: const/__init__.py:128 const/__init__.py:204 msgid "commented answer" msgstr "" -#: const/__init__.py:123 +#: const/__init__.py:129 msgid "edited question" msgstr "" -#: const/__init__.py:124 +#: const/__init__.py:130 msgid "edited answer" msgstr "" -#: const/__init__.py:125 +#: const/__init__.py:131 msgid "received badge" msgstr "" -#: const/__init__.py:126 +#: const/__init__.py:132 msgid "marked best answer" msgstr "" -#: const/__init__.py:127 +#: const/__init__.py:133 msgid "upvoted" msgstr "" -#: const/__init__.py:128 +#: const/__init__.py:134 msgid "downvoted" msgstr "" -#: const/__init__.py:129 +#: const/__init__.py:135 msgid "canceled vote" msgstr "" -#: const/__init__.py:130 +#: const/__init__.py:136 msgid "deleted question" msgstr "" -#: const/__init__.py:131 +#: const/__init__.py:137 msgid "deleted answer" msgstr "" -#: const/__init__.py:132 +#: const/__init__.py:138 msgid "marked offensive" msgstr "" -#: const/__init__.py:133 +#: const/__init__.py:139 msgid "updated tags" msgstr "" -#: const/__init__.py:134 +#: const/__init__.py:140 msgid "selected favorite" msgstr "" -#: const/__init__.py:135 +#: const/__init__.py:141 msgid "completed user profile" msgstr "" -#: const/__init__.py:136 +#: const/__init__.py:142 msgid "email update sent to user" msgstr "" -#: const/__init__.py:139 +#: const/__init__.py:145 msgid "reminder about unanswered questions sent" msgstr "" -#: const/__init__.py:143 +#: const/__init__.py:149 msgid "reminder about accepting the best answer sent" msgstr "" -#: const/__init__.py:145 +#: const/__init__.py:151 msgid "mentioned in the post" msgstr "" -#: const/__init__.py:196 +#: const/__init__.py:202 msgid "answered question" msgstr "" -#: const/__init__.py:199 +#: const/__init__.py:205 msgid "accepted answer" msgstr "" -#: const/__init__.py:203 +#: const/__init__.py:209 msgid "[closed]" msgstr "" -#: const/__init__.py:204 +#: const/__init__.py:210 msgid "[deleted]" msgstr "" -#: const/__init__.py:205 views/readers.py:544 +#: const/__init__.py:211 views/readers.py:565 msgid "initial version" msgstr "" -#: const/__init__.py:206 +#: const/__init__.py:212 msgid "retagged" msgstr "" -#: const/__init__.py:214 +#: const/__init__.py:220 msgid "off" msgstr "" -#: const/__init__.py:215 +#: const/__init__.py:221 msgid "exclude ignored" msgstr "" -#: const/__init__.py:216 +#: const/__init__.py:222 msgid "only selected" msgstr "" -#: const/__init__.py:220 +#: const/__init__.py:226 msgid "instantly" msgstr "" -#: const/__init__.py:221 +#: const/__init__.py:227 msgid "daily" msgstr "" -#: const/__init__.py:222 +#: const/__init__.py:228 msgid "weekly" msgstr "" -#: const/__init__.py:223 +#: const/__init__.py:229 msgid "no email" msgstr "" -#: const/__init__.py:230 +#: const/__init__.py:236 msgid "identicon" msgstr "" -#: const/__init__.py:231 +#: const/__init__.py:237 msgid "mystery-man" msgstr "" -#: const/__init__.py:232 +#: const/__init__.py:238 msgid "monsterid" msgstr "" -#: const/__init__.py:233 +#: const/__init__.py:239 msgid "wavatar" msgstr "" -#: const/__init__.py:234 +#: const/__init__.py:240 msgid "retro" msgstr "" -#: const/__init__.py:281 skins/default/templates/badges.html:38 +#: const/__init__.py:287 skins/default/templates/badges.html:38 msgid "gold" msgstr "" -#: const/__init__.py:282 skins/default/templates/badges.html:48 +#: const/__init__.py:288 skins/default/templates/badges.html:48 msgid "silver" msgstr "" -#: const/__init__.py:283 skins/default/templates/badges.html:55 +#: const/__init__.py:289 skins/default/templates/badges.html:55 msgid "bronze" msgstr "" -#: const/__init__.py:295 +#: const/__init__.py:301 msgid "None" msgstr "" -#: const/__init__.py:296 +#: const/__init__.py:302 msgid "Gravatar" msgstr "" -#: const/__init__.py:297 +#: const/__init__.py:303 msgid "Uploaded Avatar" msgstr "" @@ -2350,14 +2370,14 @@ msgid "" "reach a resolution." msgstr "" -#: const/message_keys.py:45 models/__init__.py:786 +#: const/message_keys.py:45 models/__init__.py:787 msgid "" "Sorry, your account appears to be suspended and you cannot make new posts " "until this issue is resolved. You can, however edit your existing posts. " "Please contact the forum administrator to reach a resolution." msgstr "" -#: deps/django_authopenid/backends.py:88 +#: deps/django_authopenid/backends.py:166 msgid "" "Welcome! Please set email address (important!) in your profile and adjust " "screen name, if necessary." @@ -2541,73 +2561,73 @@ msgstr "" msgid "OpenID %(openid_url)s is invalid" msgstr "" -#: deps/django_authopenid/views.py:261 deps/django_authopenid/views.py:412 -#: deps/django_authopenid/views.py:440 +#: deps/django_authopenid/views.py:261 deps/django_authopenid/views.py:408 +#: deps/django_authopenid/views.py:436 #, python-format msgid "" "Unfortunately, there was some problem when connecting to %(provider)s, " "please try again or use another provider" msgstr "" -#: deps/django_authopenid/views.py:362 +#: deps/django_authopenid/views.py:358 msgid "Your new password saved" msgstr "" -#: deps/django_authopenid/views.py:466 +#: deps/django_authopenid/views.py:462 msgid "The login password combination was not correct" msgstr "" -#: deps/django_authopenid/views.py:568 +#: deps/django_authopenid/views.py:564 msgid "Please click any of the icons below to sign in" msgstr "" -#: deps/django_authopenid/views.py:570 +#: deps/django_authopenid/views.py:566 msgid "Account recovery email sent" msgstr "" -#: deps/django_authopenid/views.py:573 +#: deps/django_authopenid/views.py:569 msgid "Please add one or more login methods." msgstr "" -#: deps/django_authopenid/views.py:575 +#: deps/django_authopenid/views.py:571 msgid "If you wish, please add, remove or re-validate your login methods" msgstr "" -#: deps/django_authopenid/views.py:577 +#: deps/django_authopenid/views.py:573 msgid "Please wait a second! Your account is recovered, but ..." msgstr "" -#: deps/django_authopenid/views.py:579 +#: deps/django_authopenid/views.py:575 msgid "Sorry, this account recovery key has expired or is invalid" msgstr "" -#: deps/django_authopenid/views.py:652 +#: deps/django_authopenid/views.py:648 #, python-format msgid "Login method %(provider_name)s does not exist" msgstr "" -#: deps/django_authopenid/views.py:658 +#: deps/django_authopenid/views.py:654 msgid "Oops, sorry - there was some error - please try again" msgstr "" -#: deps/django_authopenid/views.py:749 +#: deps/django_authopenid/views.py:745 #, python-format msgid "Your %(provider)s login works fine" msgstr "" -#: deps/django_authopenid/views.py:1060 deps/django_authopenid/views.py:1066 +#: deps/django_authopenid/views.py:1056 deps/django_authopenid/views.py:1062 #, python-format msgid "your email needs to be validated see %(details_url)s" msgstr "" "Your email needs to be validated. Please see details <a " "id='validate_email_alert' href='%(details_url)s'>here</a>." -#: deps/django_authopenid/views.py:1087 +#: deps/django_authopenid/views.py:1083 #, python-format msgid "Recover your %(site)s account" msgstr "" -#: deps/django_authopenid/views.py:1159 +#: deps/django_authopenid/views.py:1155 msgid "Please check your email and visit the enclosed link." msgstr "" @@ -2712,15 +2732,6 @@ msgstr "" msgid "Congratulations, you are now an Administrator" msgstr "" -#: management/commands/initialize_ldap_logins.py:51 -msgid "" -"This command may help you migrate to LDAP password authentication by " -"creating a record for LDAP association with each user account. There is an " -"assumption that ldap user id's are the same as user names registered at the " -"site. Before running this command it is necessary to set up LDAP parameters " -"in the \"External keys\" section of the site settings." -msgstr "" - #: management/commands/post_emailed_questions.py:35 msgid "" "<p>To ask by email, please:</p>\n" @@ -2752,27 +2763,27 @@ msgid "" "of your user account</p>" msgstr "" -#: management/commands/send_accept_answer_reminders.py:56 +#: management/commands/send_accept_answer_reminders.py:58 #, python-format msgid "Accept the best answer for %(question_count)d of your questions" msgstr "" -#: management/commands/send_accept_answer_reminders.py:61 +#: management/commands/send_accept_answer_reminders.py:63 msgid "Please accept the best answer for this question:" msgstr "" -#: management/commands/send_accept_answer_reminders.py:63 +#: management/commands/send_accept_answer_reminders.py:65 msgid "Please accept the best answer for these questions:" msgstr "" -#: management/commands/send_email_alerts.py:413 +#: management/commands/send_email_alerts.py:414 #, python-format msgid "%(question_count)d updated question about %(topics)s" msgid_plural "%(question_count)d updated questions about %(topics)s" msgstr[0] "" msgstr[1] "" -#: management/commands/send_email_alerts.py:424 +#: management/commands/send_email_alerts.py:425 #, python-format msgid "" "<p>Dear %(name)s,</p><p>The following question has been updated " @@ -2783,11 +2794,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: management/commands/send_email_alerts.py:448 +#: management/commands/send_email_alerts.py:449 msgid "new question" msgstr "" -#: management/commands/send_email_alerts.py:473 +#: management/commands/send_email_alerts.py:474 #, python-format msgid "" "<p>Please remember that you can always <a hrefl\"%(email_settings_link)s" @@ -2797,7 +2808,7 @@ msgid "" "friendly %(sitename)s server.</p>" msgstr "" -#: management/commands/send_unanswered_question_reminders.py:58 +#: management/commands/send_unanswered_question_reminders.py:60 #, python-format msgid "%(question_count)d unanswered question about %(topics)s" msgid_plural "%(question_count)d unanswered questions about %(topics)s" @@ -2809,74 +2820,74 @@ msgstr[1] "" msgid "Please log in to use %s" msgstr "" -#: models/__init__.py:318 +#: models/__init__.py:319 msgid "" "Sorry, you cannot accept or unaccept best answers because your account is " "blocked" msgstr "" -#: models/__init__.py:322 +#: models/__init__.py:323 msgid "" "Sorry, you cannot accept or unaccept best answers because your account is " "suspended" msgstr "" -#: models/__init__.py:335 +#: models/__init__.py:336 #, python-format msgid "" ">%(points)s points required to accept or unaccept your own answer to your " "own question" msgstr "" -#: models/__init__.py:357 +#: models/__init__.py:358 #, python-format msgid "" "Sorry, you will be able to accept this answer only after %(will_be_able_at)s" msgstr "" -#: models/__init__.py:365 +#: models/__init__.py:366 #, python-format msgid "" "Sorry, only moderators or original author of the question - %(username)s - " "can accept or unaccept the best answer" msgstr "" -#: models/__init__.py:388 +#: models/__init__.py:389 msgid "Sorry, you cannot vote for your own posts" msgstr "" -#: models/__init__.py:392 +#: models/__init__.py:393 msgid "Sorry your account appears to be blocked " msgstr "" -#: models/__init__.py:397 +#: models/__init__.py:398 msgid "Sorry your account appears to be suspended " msgstr "" -#: models/__init__.py:407 +#: models/__init__.py:408 #, python-format msgid ">%(points)s points required to upvote" msgstr "" -#: models/__init__.py:413 +#: models/__init__.py:414 #, python-format msgid ">%(points)s points required to downvote" msgstr "" -#: models/__init__.py:428 +#: models/__init__.py:429 msgid "Sorry, blocked users cannot upload files" msgstr "" -#: models/__init__.py:429 +#: models/__init__.py:430 msgid "Sorry, suspended users cannot upload files" msgstr "" -#: models/__init__.py:431 +#: models/__init__.py:432 #, python-format msgid "sorry, file uploading requires karma >%(min_rep)s" msgstr "" -#: models/__init__.py:480 +#: models/__init__.py:481 #, python-format msgid "" "Sorry, comments (except the last one) are editable only within %(minutes)s " @@ -2887,56 +2898,56 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: models/__init__.py:492 +#: models/__init__.py:493 msgid "Sorry, but only post owners or moderators can edit comments" msgstr "" -#: models/__init__.py:517 +#: models/__init__.py:518 msgid "" "Sorry, since your account is suspended you can comment only your own posts" msgstr "" -#: models/__init__.py:521 +#: models/__init__.py:522 #, python-format msgid "" "Sorry, to comment any post a minimum reputation of %(min_rep)s points is " "required. You can still comment your own posts and answers to your questions" msgstr "" -#: models/__init__.py:551 +#: models/__init__.py:552 msgid "" "This post has been deleted and can be seen only by post owners, site " "administrators and moderators" msgstr "" -#: models/__init__.py:568 +#: models/__init__.py:569 msgid "" "Sorry, only moderators, site administrators and post owners can edit deleted " "posts" msgstr "" -#: models/__init__.py:583 +#: models/__init__.py:584 msgid "Sorry, since your account is blocked you cannot edit posts" msgstr "" -#: models/__init__.py:587 +#: models/__init__.py:588 msgid "Sorry, since your account is suspended you can edit only your own posts" msgstr "" -#: models/__init__.py:592 +#: models/__init__.py:593 #, python-format msgid "" "Sorry, to edit wiki posts, a minimum reputation of %(min_rep)s is required" msgstr "" -#: models/__init__.py:599 +#: models/__init__.py:600 #, python-format msgid "" "Sorry, to edit other people's posts, a minimum reputation of %(min_rep)s is " "required" msgstr "" -#: models/__init__.py:662 +#: models/__init__.py:663 msgid "" "Sorry, cannot delete your question since it has an upvoted answer posted by " "someone else" @@ -2946,93 +2957,93 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: models/__init__.py:677 +#: models/__init__.py:678 msgid "Sorry, since your account is blocked you cannot delete posts" msgstr "" -#: models/__init__.py:681 +#: models/__init__.py:682 msgid "" "Sorry, since your account is suspended you can delete only your own posts" msgstr "" -#: models/__init__.py:685 +#: models/__init__.py:686 #, python-format msgid "" "Sorry, to deleted other people' posts, a minimum reputation of %(min_rep)s " "is required" msgstr "" -#: models/__init__.py:705 +#: models/__init__.py:706 msgid "Sorry, since your account is blocked you cannot close questions" msgstr "" -#: models/__init__.py:709 +#: models/__init__.py:710 msgid "Sorry, since your account is suspended you cannot close questions" msgstr "" -#: models/__init__.py:713 +#: models/__init__.py:714 #, python-format msgid "" "Sorry, to close other people' posts, a minimum reputation of %(min_rep)s is " "required" msgstr "" -#: models/__init__.py:722 +#: models/__init__.py:723 #, python-format msgid "" "Sorry, to close own question a minimum reputation of %(min_rep)s is required" msgstr "" -#: models/__init__.py:746 +#: models/__init__.py:747 #, python-format msgid "" "Sorry, only administrators, moderators or post owners with reputation > " "%(min_rep)s can reopen questions." msgstr "" -#: models/__init__.py:752 +#: models/__init__.py:753 #, python-format msgid "" "Sorry, to reopen own question a minimum reputation of %(min_rep)s is required" msgstr "" -#: models/__init__.py:773 +#: models/__init__.py:774 msgid "You have flagged this question before and cannot do it more than once" msgstr "" -#: models/__init__.py:781 +#: models/__init__.py:782 msgid "Sorry, since your account is blocked you cannot flag posts as offensive" msgstr "" -#: models/__init__.py:792 +#: models/__init__.py:793 #, python-format msgid "" "Sorry, to flag posts as offensive a minimum reputation of %(min_rep)s is " "required" msgstr "" -#: models/__init__.py:813 +#: models/__init__.py:814 #, python-format msgid "" "Sorry, you have exhausted the maximum number of %(max_flags_per_day)s " "offensive flags per day." msgstr "" -#: models/__init__.py:825 +#: models/__init__.py:826 msgid "cannot remove non-existing flag" msgstr "" -#: models/__init__.py:831 +#: models/__init__.py:832 msgid "Sorry, since your account is blocked you cannot remove flags" msgstr "" -#: models/__init__.py:835 +#: models/__init__.py:836 msgid "" "Sorry, your account appears to be suspended and you cannot remove flags. " "Please contact the forum administrator to reach a resolution." msgstr "" -#: models/__init__.py:841 +#: models/__init__.py:842 #, python-format msgid "Sorry, to flag posts a minimum reputation of %(min_rep)d is required" msgid_plural "" @@ -3040,175 +3051,175 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: models/__init__.py:860 +#: models/__init__.py:861 msgid "you don't have the permission to remove all flags" msgstr "" -#: models/__init__.py:861 +#: models/__init__.py:862 msgid "no flags for this entry" msgstr "" -#: models/__init__.py:885 +#: models/__init__.py:886 msgid "" "Sorry, only question owners, site administrators and moderators can retag " "deleted questions" msgstr "" -#: models/__init__.py:892 +#: models/__init__.py:893 msgid "Sorry, since your account is blocked you cannot retag questions" msgstr "" -#: models/__init__.py:896 +#: models/__init__.py:897 msgid "" "Sorry, since your account is suspended you can retag only your own questions" msgstr "" -#: models/__init__.py:900 +#: models/__init__.py:901 #, python-format msgid "" "Sorry, to retag questions a minimum reputation of %(min_rep)s is required" msgstr "" -#: models/__init__.py:919 +#: models/__init__.py:920 msgid "Sorry, since your account is blocked you cannot delete comment" msgstr "" -#: models/__init__.py:923 +#: models/__init__.py:924 msgid "" "Sorry, since your account is suspended you can delete only your own comments" msgstr "" -#: models/__init__.py:927 +#: models/__init__.py:928 #, python-format msgid "Sorry, to delete comments reputation of %(min_rep)s is required" msgstr "" -#: models/__init__.py:951 +#: models/__init__.py:952 msgid "sorry, but older votes cannot be revoked" msgstr "" -#: models/__init__.py:1427 utils/functions.py:78 +#: models/__init__.py:1438 utils/functions.py:78 #, python-format msgid "on %(date)s" msgstr "" -#: models/__init__.py:1429 +#: models/__init__.py:1440 msgid "in two days" msgstr "" -#: models/__init__.py:1431 +#: models/__init__.py:1442 msgid "tomorrow" msgstr "" -#: models/__init__.py:1433 +#: models/__init__.py:1444 #, python-format msgid "in %(hr)d hour" msgid_plural "in %(hr)d hours" msgstr[0] "" msgstr[1] "" -#: models/__init__.py:1435 +#: models/__init__.py:1446 #, python-format msgid "in %(min)d min" msgid_plural "in %(min)d mins" msgstr[0] "" msgstr[1] "" -#: models/__init__.py:1436 +#: models/__init__.py:1447 #, python-format msgid "%(days)d day" msgid_plural "%(days)d days" msgstr[0] "" msgstr[1] "" -#: models/__init__.py:1438 +#: models/__init__.py:1449 #, python-format msgid "" "New users must wait %(days)s before answering their own question. You can " "post an answer %(left)s" msgstr "" -#: models/__init__.py:1605 skins/default/templates/feedback_email.txt:9 +#: models/__init__.py:1622 skins/default/templates/feedback_email.txt:9 msgid "Anonymous" msgstr "" -#: models/__init__.py:1701 +#: models/__init__.py:1718 msgid "Site Adminstrator" msgstr "" -#: models/__init__.py:1703 +#: models/__init__.py:1720 msgid "Forum Moderator" msgstr "" -#: models/__init__.py:1705 +#: models/__init__.py:1722 msgid "Suspended User" msgstr "" -#: models/__init__.py:1707 +#: models/__init__.py:1724 msgid "Blocked User" msgstr "" -#: models/__init__.py:1709 +#: models/__init__.py:1726 msgid "Registered User" msgstr "" -#: models/__init__.py:1711 +#: models/__init__.py:1728 msgid "Watched User" msgstr "" -#: models/__init__.py:1713 +#: models/__init__.py:1730 msgid "Approved User" msgstr "" -#: models/__init__.py:1822 +#: models/__init__.py:1839 #, python-format msgid "%(username)s karma is %(reputation)s" msgstr "" -#: models/__init__.py:1832 +#: models/__init__.py:1849 #, python-format msgid "one gold badge" msgid_plural "%(count)d gold badges" msgstr[0] "" msgstr[1] "" -#: models/__init__.py:1839 +#: models/__init__.py:1856 #, python-format msgid "one silver badge" msgid_plural "%(count)d silver badges" msgstr[0] "" msgstr[1] "" -#: models/__init__.py:1846 +#: models/__init__.py:1863 #, python-format msgid "one bronze badge" msgid_plural "%(count)d bronze badges" msgstr[0] "" msgstr[1] "" -#: models/__init__.py:1857 +#: models/__init__.py:1874 #, python-format msgid "%(item1)s and %(item2)s" msgstr "" -#: models/__init__.py:1861 +#: models/__init__.py:1878 #, python-format msgid "%(user)s has %(badges)s" msgstr "" -#: models/__init__.py:2328 +#: models/__init__.py:2354 #, python-format msgid "\"%(title)s\"" msgstr "" -#: models/__init__.py:2465 +#: models/__init__.py:2491 #, python-format msgid "" "Congratulations, you have received a badge '%(badge_name)s'. Check out <a " "href=\"%(user_profile)s\">your profile</a>." msgstr "" -#: models/__init__.py:2667 views/commands.py:450 +#: models/__init__.py:2694 views/commands.py:457 msgid "Your tag subscription was saved, thanks!" msgstr "" @@ -3474,54 +3485,54 @@ msgstr "" msgid "Very active in one tag" msgstr "" -#: models/post.py:1056 +#: models/post.py:1071 msgid "Sorry, this question has been deleted and is no longer accessible" msgstr "" -#: models/post.py:1072 +#: models/post.py:1087 msgid "" "Sorry, the answer you are looking for is no longer available, because the " "parent question has been removed" msgstr "" -#: models/post.py:1079 +#: models/post.py:1094 msgid "Sorry, this answer has been removed and is no longer accessible" msgstr "" -#: models/post.py:1095 +#: models/post.py:1110 msgid "" "Sorry, the comment you are looking for is no longer accessible, because the " "parent question has been removed" msgstr "" -#: models/post.py:1102 +#: models/post.py:1117 msgid "" "Sorry, the comment you are looking for is no longer accessible, because the " "parent answer has been removed" msgstr "" -#: models/question.py:51 +#: models/question.py:54 #, python-format msgid "\" and \"%s\"" msgstr "" -#: models/question.py:54 +#: models/question.py:57 msgid "\" and more" msgstr "" -#: models/repute.py:141 +#: models/repute.py:143 #, python-format msgid "<em>Changed by moderator. Reason:</em> %(reason)s" msgstr "" -#: models/repute.py:152 +#: models/repute.py:154 #, python-format msgid "" "%(points)s points were added for %(username)s's contribution to question " "%(question_title)s" msgstr "" -#: models/repute.py:157 +#: models/repute.py:159 #, python-format msgid "" "%(points)s points were subtracted for %(username)s's contribution to " @@ -3637,7 +3648,7 @@ msgstr "" #: skins/default/templates/question_retag.html:22 #: skins/default/templates/reopen.html:27 #: skins/default/templates/subscribe_for_tags.html:16 -#: skins/default/templates/user_profile/user_edit.html:103 +#: skins/default/templates/user_profile/user_edit.html:102 msgid "Cancel" msgstr "" @@ -3720,86 +3731,23 @@ msgid "" msgstr "" #: skins/common/templates/authopenid/complete.html:21 -#: skins/common/templates/authopenid/complete.html:23 msgid "Registration" msgstr "" -#: skins/common/templates/authopenid/complete.html:27 -#, python-format -msgid "" -"<p><span class=\\\"big strong\\\">You are here for the first time with " -"your \n" -"%%(provider)s login.</span> Please create your <strong>screen name</" -"strong> \n" -"and save your <strong>email</strong> address. Saved email address will let \n" -"you <strong>subscribe for the updates</strong> on the most interesting \n" -"questions and will be used to create and retrieve your unique avatar image " -"- \n" -"<a href='%%(gravatar_faq_url)s'><strong>gravatar</strong></a>.</p>" -msgstr "" - -#: skins/common/templates/authopenid/complete.html:36 -#, python-format -msgid "" -"<p><span class='strong big'>Oops... looks like screen name %%(username)s " -"is \n" -"already used in another account.</span></p><p>Please choose another screen \n" -"name to use with your %%(provider)s login. Also, a valid email address is \n" -"required on the <span class='orange'>Q&A</span> forum. Your email is \n" -"used to create a unique <a href='%%(gravatar_faq_url)s'><strong>gravatar\n" -"</strong></a> image for your account. If you like, you can <strong>receive \n" -"updates</strong> on the interesting questions or entire forum by email. \n" -"Email addresses are never shown or otherwise shared with anybody else.</p>\n" -" " -msgstr "" - -#: skins/common/templates/authopenid/complete.html:46 -#, python-format -msgid "" -"\n" -"<p><span class=\\\"big strong\\\">You are here for the first time with " -"your \n" -"%%(provider)s login.</span></p><p>You can either keep your <strong>screen \n" -"name</strong> the same as your %%(provider)s login name or choose some " -"other \n" -"nickname.</p><p>Also, please save a valid <strong>email</strong> address. \n" -"With the email you can <strong>subscribe for the updates</strong> on the \n" -"most interesting questions. Email address is also used to create and \n" -"retrieve your unique avatar image - <a \n" -"href='%%(gravatar_faq_url)s'><strong>gravatar</strong></a>.</p>" -msgstr "" - -#: skins/common/templates/authopenid/complete.html:57 -#, python-format -msgid "" -"<p><span class=\\\"big strong\\\">You are here for the first time with " -"your \n" -"Facebook login.</span> Please create your <strong>screen name</strong> and \n" -"save your <strong>email</strong> address. Saved email address will let you \n" -"<strong>subscribe for the updates</strong> on the most interesting " -"questions \n" -"and will be used to create and retrieve your unique avatar image - \n" -"<a href='%%(gravatar_faq_url)s'><strong>gravatar</strong></a>.</p>" -msgstr "" - -#: skins/common/templates/authopenid/complete.html:65 -msgid "This account already exists, please use another." +#: skins/common/templates/authopenid/complete.html:23 +msgid "User registration" msgstr "" -#: skins/common/templates/authopenid/complete.html:101 +#: skins/common/templates/authopenid/complete.html:60 msgid "<strong>Receive forum updates by email</strong>" msgstr "" -#: skins/common/templates/authopenid/complete.html:105 +#: skins/common/templates/authopenid/complete.html:64 #: skins/common/templates/authopenid/signup_with_password.html:46 msgid "please select one of the options above" msgstr "" -#: skins/common/templates/authopenid/complete.html:108 -msgid "Tag filter tool will be your right panel, once you log in." -msgstr "" - -#: skins/common/templates/authopenid/complete.html:109 +#: skins/common/templates/authopenid/complete.html:67 #: skins/common/templates/authopenid/signup_with_password.html:4 #: skins/common/templates/authopenid/signup_with_password.html:53 msgid "Signup" @@ -3975,7 +3923,7 @@ msgid "delete, if you like" msgstr "" #: skins/common/templates/authopenid/signin.html:170 -#: skins/common/templates/question/answer_controls.html:19 +#: skins/common/templates/question/answer_controls.html:13 #: skins/common/templates/question/question_controls.html:10 msgid "delete" msgstr "" @@ -4114,55 +4062,51 @@ msgstr "" msgid "link" msgstr "" -#: skins/common/templates/question/answer_controls.html:19 +#: skins/common/templates/question/answer_controls.html:13 #: skins/common/templates/question/question_controls.html:10 msgid "undelete" msgstr "" -#: skins/common/templates/question/answer_controls.html:24 -#: skins/common/templates/question/answer_controls.html:34 -#: skins/common/templates/question/answer_controls.html:50 -#: skins/common/templates/question/question_controls.html:19 +#: skins/common/templates/question/answer_controls.html:19 +msgid "remove offensive flag" +msgstr "" + +#: skins/common/templates/question/answer_controls.html:21 +#: skins/common/templates/question/question_controls.html:22 +msgid "remove flag" +msgstr "" + +#: skins/common/templates/question/answer_controls.html:26 +#: skins/common/templates/question/answer_controls.html:35 +#: skins/common/templates/question/question_controls.html:20 #: skins/common/templates/question/question_controls.html:26 #: skins/common/templates/question/question_controls.html:33 msgid "" "report as offensive (i.e containing spam, advertising, malicious text, etc.)" msgstr "" -#: skins/common/templates/question/answer_controls.html:26 -#: skins/common/templates/question/answer_controls.html:36 -#: skins/common/templates/question/answer_controls.html:52 -#: skins/common/templates/question/question_controls.html:21 +#: skins/common/templates/question/answer_controls.html:28 +#: skins/common/templates/question/answer_controls.html:37 +#: skins/common/templates/question/question_controls.html:28 #: skins/common/templates/question/question_controls.html:35 msgid "flag offensive" msgstr "" -#: skins/common/templates/question/answer_controls.html:42 -msgid "remove offensive flag" -msgstr "" - -#: skins/common/templates/question/answer_controls.html:44 -#: skins/common/templates/question/question_controls.html:28 -msgid "remove flag" -msgstr "" - -#: skins/common/templates/question/answer_controls.html:56 +#: skins/common/templates/question/answer_controls.html:41 #: skins/common/templates/question/question_controls.html:42 -#: skins/default/templates/macros.html:313 +#: skins/default/templates/macros.html:307 #: skins/default/templates/revisions.html:38 #: skins/default/templates/revisions.html:41 msgid "edit" msgstr "" -#: skins/common/templates/question/answer_vote_buttons.html:14 -#: skins/common/templates/question/answer_vote_buttons.html:15 -msgid "mark this answer as correct (click again to undo)" +#: skins/common/templates/question/answer_vote_buttons.html:6 +#: skins/default/templates/user_profile/user_stats.html:24 +msgid "this answer has been selected as correct" msgstr "" -#: skins/common/templates/question/answer_vote_buttons.html:17 -#: skins/common/templates/question/answer_vote_buttons.html:18 -#, python-format -msgid "%(question_author)s has selected this answer as correct" +#: skins/common/templates/question/answer_vote_buttons.html:8 +msgid "mark this answer as correct (click again to undo)" msgstr "" #: skins/common/templates/question/closed_question_info.html:2 @@ -4853,170 +4797,132 @@ msgid "Share this question on %(site)s" msgstr "" #: skins/default/templates/macros.html:16 -#: skins/default/templates/macros.html:440 +#: skins/default/templates/macros.html:432 #, python-format msgid "follow %(alias)s" msgstr "" #: skins/default/templates/macros.html:19 -#: skins/default/templates/macros.html:443 +#: skins/default/templates/macros.html:435 #, python-format msgid "unfollow %(alias)s" msgstr "" #: skins/default/templates/macros.html:20 -#: skins/default/templates/macros.html:444 +#: skins/default/templates/macros.html:436 #, python-format msgid "following %(alias)s" msgstr "" -#: skins/default/templates/macros.html:31 -msgid "i like this question (click again to cancel)" -msgstr "" - #: skins/default/templates/macros.html:33 -msgid "i like this answer (click again to cancel)" -msgstr "" - -#: skins/default/templates/macros.html:39 msgid "current number of votes" msgstr "" -#: skins/default/templates/macros.html:45 -msgid "i dont like this question (click again to cancel)" -msgstr "" - -#: skins/default/templates/macros.html:47 -msgid "i dont like this answer (click again to cancel)" -msgstr "" - -#: skins/default/templates/macros.html:54 +#: skins/default/templates/macros.html:46 msgid "anonymous user" msgstr "" -#: skins/default/templates/macros.html:87 +#: skins/default/templates/macros.html:79 msgid "this post is marked as community wiki" msgstr "" -#: skins/default/templates/macros.html:90 +#: skins/default/templates/macros.html:82 #, python-format msgid "" "This post is a wiki.\n" " Anyone with karma >%(wiki_min_rep)s is welcome to improve it." msgstr "" -#: skins/default/templates/macros.html:96 +#: skins/default/templates/macros.html:88 msgid "asked" msgstr "" -#: skins/default/templates/macros.html:98 +#: skins/default/templates/macros.html:90 msgid "answered" msgstr "" -#: skins/default/templates/macros.html:100 +#: skins/default/templates/macros.html:92 msgid "posted" msgstr "" -#: skins/default/templates/macros.html:130 +#: skins/default/templates/macros.html:122 msgid "updated" msgstr "" -#: skins/default/templates/macros.html:206 +#: skins/default/templates/macros.html:198 #, python-format msgid "see questions tagged '%(tag)s'" msgstr "" -#: skins/default/templates/macros.html:258 -#: skins/default/templates/macros.html:266 -#: skins/default/templates/question/javascript.html:20 -msgid "post a comment" -msgstr "" - -#: skins/default/templates/macros.html:259 -#, python-format -msgid "see <strong>%(counter)s</strong> more" -msgid_plural "see <strong>%(counter)s</strong> more" -msgstr[0] "" -msgstr[1] "" - -#: skins/default/templates/macros.html:261 -#, python-format -msgid "see <strong>%(counter)s</strong> more comment" -msgid_plural "" -"see <strong>%(counter)s</strong> more comments\n" -" " -msgstr[0] "" -msgstr[1] "" - -#: skins/default/templates/macros.html:305 +#: skins/default/templates/macros.html:300 msgid "delete this comment" msgstr "" -#: skins/default/templates/macros.html:511 templatetags/extra_tags.py:43 +#: skins/default/templates/macros.html:503 templatetags/extra_tags.py:43 #, python-format msgid "%(username)s gravatar image" msgstr "" -#: skins/default/templates/macros.html:520 +#: skins/default/templates/macros.html:512 #, python-format msgid "%(username)s's website is %(url)s" msgstr "" -#: skins/default/templates/macros.html:535 -#: skins/default/templates/macros.html:536 -#: skins/default/templates/macros.html:574 -#: skins/default/templates/macros.html:575 +#: skins/default/templates/macros.html:527 +#: skins/default/templates/macros.html:528 +#: skins/default/templates/macros.html:566 +#: skins/default/templates/macros.html:567 msgid "previous" msgstr "" -#: skins/default/templates/macros.html:547 -#: skins/default/templates/macros.html:586 +#: skins/default/templates/macros.html:539 +#: skins/default/templates/macros.html:578 msgid "current page" msgstr "" -#: skins/default/templates/macros.html:549 -#: skins/default/templates/macros.html:556 -#: skins/default/templates/macros.html:588 -#: skins/default/templates/macros.html:595 +#: skins/default/templates/macros.html:541 +#: skins/default/templates/macros.html:548 +#: skins/default/templates/macros.html:580 +#: skins/default/templates/macros.html:587 #, python-format msgid "page %(num)s" msgstr "" -#: skins/default/templates/macros.html:560 -#: skins/default/templates/macros.html:599 +#: skins/default/templates/macros.html:552 +#: skins/default/templates/macros.html:591 msgid "next page" msgstr "" -#: skins/default/templates/macros.html:611 +#: skins/default/templates/macros.html:603 #, python-format msgid "responses for %(username)s" msgstr "" -#: skins/default/templates/macros.html:614 +#: skins/default/templates/macros.html:606 #, python-format -msgid "you have a new response" +msgid "you have %(response_count)s new response" msgid_plural "you have %(response_count)s new responses" msgstr[0] "" msgstr[1] "" -#: skins/default/templates/macros.html:617 +#: skins/default/templates/macros.html:609 msgid "no new responses yet" msgstr "" -#: skins/default/templates/macros.html:632 -#: skins/default/templates/macros.html:633 +#: skins/default/templates/macros.html:624 +#: skins/default/templates/macros.html:625 #, python-format msgid "%(new)s new flagged posts and %(seen)s previous" msgstr "" -#: skins/default/templates/macros.html:635 -#: skins/default/templates/macros.html:636 +#: skins/default/templates/macros.html:627 +#: skins/default/templates/macros.html:628 #, python-format msgid "%(new)s new flagged posts" msgstr "" -#: skins/default/templates/macros.html:641 -#: skins/default/templates/macros.html:642 +#: skins/default/templates/macros.html:633 +#: skins/default/templates/macros.html:634 #, python-format msgid "%(seen)s flagged posts" msgstr "" @@ -5025,6 +4931,19 @@ msgstr "" msgid "Questions" msgstr "" +#: skins/default/templates/question.html:98 +msgid "post a comment / <strong>some</strong> more" +msgstr "" + +#: skins/default/templates/question.html:101 +msgid "see <strong>some</strong> more" +msgstr "" + +#: skins/default/templates/question.html:105 +#: skins/default/templates/question/javascript.html:20 +msgid "post a comment" +msgstr "" + #: skins/default/templates/question_edit.html:4 #: skins/default/templates/question_edit.html:9 msgid "Edit question" @@ -5537,11 +5456,11 @@ msgstr "" msgid "Screen Name" msgstr "" -#: skins/default/templates/user_profile/user_edit.html:60 +#: skins/default/templates/user_profile/user_edit.html:59 msgid "(cannot be changed)" msgstr "" -#: skins/default/templates/user_profile/user_edit.html:102 +#: skins/default/templates/user_profile/user_edit.html:101 #: skins/default/templates/user_profile/user_email_subscriptions.html:22 msgid "Update" msgstr "" @@ -5828,10 +5747,6 @@ msgstr[1] "" msgid "the answer has been voted for %(answer_score)s times" msgstr "" -#: skins/default/templates/user_profile/user_stats.html:24 -msgid "this answer has been selected as correct" -msgstr "" - #: skins/default/templates/user_profile/user_stats.html:34 #, python-format msgid "(%(comment_count)s comment)" @@ -5884,7 +5799,7 @@ msgstr "" msgid "User profile" msgstr "" -#: skins/default/templates/user_profile/user_tabs.html:10 views/users.py:630 +#: skins/default/templates/user_profile/user_tabs.html:10 views/users.py:638 msgid "comments and answers to others questions" msgstr "" @@ -5900,11 +5815,11 @@ msgstr "" msgid "questions that user is following" msgstr "" -#: skins/default/templates/user_profile/user_tabs.html:34 views/users.py:671 +#: skins/default/templates/user_profile/user_tabs.html:34 views/users.py:679 msgid "user vote record" msgstr "" -#: skins/default/templates/user_profile/user_tabs.html:40 views/users.py:761 +#: skins/default/templates/user_profile/user_tabs.html:40 views/users.py:769 msgid "email subscription settings" msgstr "" @@ -6279,21 +6194,21 @@ msgstr "" msgid "email update frequency has been set to daily" msgstr "" -#: views/commands.py:454 +#: views/commands.py:461 #, python-format msgid "Tag subscription was canceled (<a href=\"%(url)s\">undo</a>)." msgstr "" -#: views/commands.py:463 +#: views/commands.py:470 #, python-format msgid "Please sign in to subscribe for: %(tags)s" msgstr "" -#: views/commands.py:589 +#: views/commands.py:596 msgid "Please sign in to vote" msgstr "" -#: views/commands.py:609 +#: views/commands.py:616 msgid "Please sign in to delete/restore posts" msgstr "" @@ -6325,7 +6240,7 @@ msgid_plural "%(q_num)s questions, tagged" msgstr[0] "" msgstr[1] "" -#: views/readers.py:365 +#: views/readers.py:387 msgid "" "Sorry, the comment you are looking for has been deleted and is no longer " "accessible" @@ -6335,55 +6250,55 @@ msgstr "" msgid "moderate user" msgstr "" -#: views/users.py:373 +#: views/users.py:381 msgid "user profile" msgstr "" -#: views/users.py:374 +#: views/users.py:382 msgid "user profile overview" msgstr "" -#: views/users.py:543 +#: views/users.py:551 msgid "recent user activity" msgstr "" -#: views/users.py:544 +#: views/users.py:552 msgid "profile - recent activity" msgstr "" -#: views/users.py:631 +#: views/users.py:639 msgid "profile - responses" msgstr "" -#: views/users.py:672 +#: views/users.py:680 msgid "profile - votes" msgstr "" -#: views/users.py:693 +#: views/users.py:701 msgid "user karma" msgstr "" -#: views/users.py:694 +#: views/users.py:702 msgid "Profile - User's Karma" msgstr "" -#: views/users.py:712 +#: views/users.py:720 msgid "users favorite questions" msgstr "" -#: views/users.py:713 +#: views/users.py:721 msgid "profile - favorite questions" msgstr "" -#: views/users.py:733 views/users.py:737 +#: views/users.py:741 views/users.py:745 msgid "changes saved" msgstr "" -#: views/users.py:743 +#: views/users.py:751 msgid "email updates canceled" msgstr "" -#: views/users.py:762 +#: views/users.py:770 msgid "profile - email subscriptions" msgstr "" @@ -6414,29 +6329,29 @@ msgid "" "Login takes about 30 seconds, initial signup takes a minute or less." msgstr "" -#: views/writers.py:475 +#: views/writers.py:482 msgid "Please log in to answer questions" msgstr "" -#: views/writers.py:581 +#: views/writers.py:588 #, python-format msgid "" "Sorry, you appear to be logged out and cannot post comments. Please <a href=" "\"%(sign_in_url)s\">sign in</a>." msgstr "" -#: views/writers.py:598 +#: views/writers.py:605 msgid "Sorry, anonymous users cannot edit comments" msgstr "" -#: views/writers.py:628 +#: views/writers.py:635 #, python-format msgid "" "Sorry, you appear to be logged out and cannot delete comments. Please <a " "href=\"%(sign_in_url)s\">sign in</a>." msgstr "" -#: views/writers.py:648 +#: views/writers.py:656 msgid "sorry, we seem to have some technical difficulties" msgstr "" diff --git a/askbot/locale/es/LC_MESSAGES/django.po b/askbot/locale/es/LC_MESSAGES/django.po index ca79976e..add0cf74 100644 --- a/askbot/locale/es/LC_MESSAGES/django.po +++ b/askbot/locale/es/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: askbot\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-11 22:13-0500\n" +"POT-Creation-Date: 2012-03-11 22:43-0500\n" "PO-Revision-Date: 2012-03-09 14:57+0000\n" "Last-Translator: Victor Trujillo <>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/" @@ -814,15 +814,15 @@ msgstr "" msgid "Enable recaptcha (keys below are required)" msgstr "Habilitar recaptcha (las llaves de abajo son requeridas)" -#: conf/external_keys.py:60 +#: conf/external_keys.py:62 msgid "Recaptcha public key" msgstr "Llave pública de Recaptcha" -#: conf/external_keys.py:68 +#: conf/external_keys.py:70 msgid "Recaptcha private key" msgstr "Llave privada de Recaptcha" -#: conf/external_keys.py:70 +#: conf/external_keys.py:72 #, python-format msgid "" "Recaptcha is a tool that helps distinguish real people from annoying spam " @@ -832,11 +832,11 @@ msgstr "" "Recaptcha te permite distinguir a gente real de los robots que envían spam. " "Puedes obtener una clave pública aqui: <a href=\"%(url)s\">%(url)s</a>" -#: conf/external_keys.py:82 +#: conf/external_keys.py:84 msgid "Facebook public API key" msgstr "Llave pública para API de Facebook" -#: conf/external_keys.py:84 +#: conf/external_keys.py:86 #, python-format msgid "" "Facebook API key and Facebook secret allow to use Facebook Connect login " @@ -847,15 +847,15 @@ msgstr "" "tu sitio. Para obtener las llaves debes <a href=\"%(url)s\">crear aplicación " "en Facebook</a> site" -#: conf/external_keys.py:97 +#: conf/external_keys.py:99 msgid "Facebook secret key" msgstr "Llave privada de Facebook" -#: conf/external_keys.py:105 +#: conf/external_keys.py:107 msgid "Twitter consumer key" msgstr "Twitter Key" -#: conf/external_keys.py:107 +#: conf/external_keys.py:109 #, python-format msgid "" "Please register your forum at <a href=\"%(url)s\">twitter applications site</" @@ -864,15 +864,15 @@ msgstr "" "Por favor, registra tu foro en <a href=\"%(url)s\">twitter para " "aplicaciones</a>" -#: conf/external_keys.py:118 +#: conf/external_keys.py:120 msgid "Twitter consumer secret" msgstr "Twitter Secret" -#: conf/external_keys.py:126 +#: conf/external_keys.py:128 msgid "LinkedIn consumer key" msgstr "LinkedIn Key" -#: conf/external_keys.py:128 +#: conf/external_keys.py:130 #, python-format msgid "" "Please register your forum at <a href=\"%(url)s\">LinkedIn developer site</a>" @@ -880,15 +880,15 @@ msgstr "" "Por favor, registra tu foro en <a href=\"%(url)s\">LinkedIn para " "Desarrolladores</a>" -#: conf/external_keys.py:139 +#: conf/external_keys.py:141 msgid "LinkedIn consumer secret" msgstr "LinkedIn Secret" -#: conf/external_keys.py:147 +#: conf/external_keys.py:149 msgid "ident.ca consumer key" msgstr "ident.ca key" -#: conf/external_keys.py:149 +#: conf/external_keys.py:151 #, python-format msgid "" "Please register your forum at <a href=\"%(url)s\">Identi.ca applications " @@ -896,26 +896,10 @@ msgid "" msgstr "" "Por favor, registra tu foro en <a href=\"%(url)s\">Identi.ca aplicaciones</a>" -#: conf/external_keys.py:160 +#: conf/external_keys.py:162 msgid "ident.ca consumer secret" msgstr "ident.ca secret" -#: conf/external_keys.py:168 -msgid "Use LDAP authentication for the password login" -msgstr "Utiliza la autenticación LDAP para el password del login" - -#: conf/external_keys.py:177 -msgid "LDAP service provider name" -msgstr "Proveedor de servicio LDAP" - -#: conf/external_keys.py:185 -msgid "URL for the LDAP service" -msgstr "URL del servicio LDAP" - -#: conf/external_keys.py:193 -msgid "Explain how to change LDAP password" -msgstr "Explicar cómo cambiar el password LDAP" - #: conf/flatpages.py:11 msgid "Flatpages - about, privacy policy, etc." msgstr "Páginas simples - sobre nosotros, política de privacidad, etc." @@ -1147,6 +1131,40 @@ msgstr "Número máximo de preguntas a listar por defecto" msgid "What should \"unanswered question\" mean?" msgstr "¿Qué debería significar \"pregunta sin responder\"?" +#: conf/ldap.py:9 +msgid "LDAP login configuration" +msgstr "" + +#: conf/ldap.py:17 +msgid "Use LDAP authentication for the password login" +msgstr "Utiliza la autenticación LDAP para el password del login" + +#: conf/ldap.py:26 +msgid "LDAP URL" +msgstr "" + +#: conf/ldap.py:35 +msgid "LDAP BASE DN" +msgstr "" + +#: conf/ldap.py:43 +msgid "LDAP Search Scope" +msgstr "" + +#: conf/ldap.py:52 +#, fuzzy +msgid "LDAP Server USERID field name" +msgstr "Proveedor de servicio LDAP" + +#: conf/ldap.py:61 +msgid "LDAP Server \"Common Name\" field name" +msgstr "" + +#: conf/ldap.py:70 +#, fuzzy +msgid "LDAP Server EMAIL field name" +msgstr "Proveedor de servicio LDAP" + #: conf/leading_sidebar.py:12 msgid "Common left sidebar" msgstr "Columna lateral de la izquierda" @@ -1672,27 +1690,27 @@ msgstr "Descripcion del sitio para los motores de busqueda" msgid "Short name for your Q&A forum" msgstr "Nombre corto para tu foro" -#: conf/site_settings.py:68 +#: conf/site_settings.py:67 msgid "Base URL for your Q&A forum, must start with http or https" msgstr "Direccion URL base para el sitio, debe comenzar por http o https" -#: conf/site_settings.py:79 +#: conf/site_settings.py:78 msgid "Check to enable greeting for anonymous user" msgstr "Marca para activar el saludo a los usuarios anonimos" -#: conf/site_settings.py:90 +#: conf/site_settings.py:89 msgid "Text shown in the greeting message shown to the anonymous user" msgstr "Texto mostrado en el mensaje de agradecimiento a los usuarios anonimos" -#: conf/site_settings.py:94 +#: conf/site_settings.py:93 msgid "Use HTML to format the message " msgstr "Utiliza HTML para formatear el mensaje" -#: conf/site_settings.py:103 +#: conf/site_settings.py:102 msgid "Feedback site URL" msgstr "Direccion URL de contacto" -#: conf/site_settings.py:105 +#: conf/site_settings.py:104 msgid "If left empty, a simple internal feedback form will be used instead" msgstr "Si lo dejas en blanco, se utilizara un formulario de contacto simple" @@ -2141,11 +2159,11 @@ msgid "Use automatic avatars from gravatar.com" msgstr "Utilizar los avatars automaticos de gravatar.com" #: conf/user_settings.py:85 -#, python-format +#, fuzzy, python-format msgid "" "Check this option if you want to allow the use of gravatar.com for avatars. " "Please, note that this feature might take about 10 minutes to become " -"100%% effective. You will have to enable uploaded avatars as well. For more " +"100% effective. You will have to enable uploaded avatars as well. For more " "information, please visit <a href=\"http://askbot.org/doc/optional-modules." "html#uploaded-avatars\">this page</a>." msgstr "" @@ -2612,7 +2630,7 @@ msgid "" "Please contact the forum administrator to reach a resolution." msgstr "" -#: deps/django_authopenid/backends.py:88 +#: deps/django_authopenid/backends.py:166 msgid "" "Welcome! Please set email address (important!) in your profile and adjust " "screen name, if necessary." @@ -2803,8 +2821,8 @@ msgstr "Regístrate con la cuenta de %(provider)s" msgid "OpenID %(openid_url)s is invalid" msgstr "OpenID %(openid_url)s incorrecto" -#: deps/django_authopenid/views.py:261 deps/django_authopenid/views.py:412 -#: deps/django_authopenid/views.py:440 +#: deps/django_authopenid/views.py:261 deps/django_authopenid/views.py:408 +#: deps/django_authopenid/views.py:436 #, python-format msgid "" "Unfortunately, there was some problem when connecting to %(provider)s, " @@ -2813,67 +2831,67 @@ msgstr "" "Lo sentimos, hay problemas de conexion con %(provider)s, por favor intenta " "de nuevo o utiliza otro proveedor." -#: deps/django_authopenid/views.py:362 +#: deps/django_authopenid/views.py:358 msgid "Your new password saved" msgstr "Nueva contraseña guardada" -#: deps/django_authopenid/views.py:466 +#: deps/django_authopenid/views.py:462 msgid "The login password combination was not correct" msgstr "La combinación de login y contraseña no es correcta" -#: deps/django_authopenid/views.py:568 +#: deps/django_authopenid/views.py:564 msgid "Please click any of the icons below to sign in" msgstr "Por favor elige cualquiera de los iconos de abajo para registrarte" -#: deps/django_authopenid/views.py:570 +#: deps/django_authopenid/views.py:566 msgid "Account recovery email sent" msgstr "Se envio el correo para recuperación de cuenta" -#: deps/django_authopenid/views.py:573 +#: deps/django_authopenid/views.py:569 msgid "Please add one or more login methods." msgstr "Por favor añade uno o más métodos de login" -#: deps/django_authopenid/views.py:575 +#: deps/django_authopenid/views.py:571 msgid "If you wish, please add, remove or re-validate your login methods" msgstr "Si quieres, puedes añadir, eliminar o editar tus métodos de login" -#: deps/django_authopenid/views.py:577 +#: deps/django_authopenid/views.py:573 msgid "Please wait a second! Your account is recovered, but ..." msgstr "Por favor espera un momento, tu cuenta se ha recuperado, pero..." -#: deps/django_authopenid/views.py:579 +#: deps/django_authopenid/views.py:575 msgid "Sorry, this account recovery key has expired or is invalid" msgstr "" "Lo sentimos, la llave de recuperación de esta cuenta ha expirado o es " "inválida" -#: deps/django_authopenid/views.py:652 +#: deps/django_authopenid/views.py:648 #, python-format msgid "Login method %(provider_name)s does not exist" msgstr "El método de login de %(provider_name)s no existe" -#: deps/django_authopenid/views.py:658 +#: deps/django_authopenid/views.py:654 msgid "Oops, sorry - there was some error - please try again" msgstr "Lo siento, se ha producido un error, inténtalo de nuevo." -#: deps/django_authopenid/views.py:749 +#: deps/django_authopenid/views.py:745 #, python-format msgid "Your %(provider)s login works fine" msgstr "Tu login de %(provider)s funciona correctamente" -#: deps/django_authopenid/views.py:1060 deps/django_authopenid/views.py:1066 +#: deps/django_authopenid/views.py:1056 deps/django_authopenid/views.py:1062 #, python-format msgid "your email needs to be validated see %(details_url)s" msgstr "" "Tu email necesita validación. Encuentra más detalles <a " "id='validate_email_alert' href='%(details_url)s'>aqui</a>." -#: deps/django_authopenid/views.py:1087 +#: deps/django_authopenid/views.py:1083 #, python-format msgid "Recover your %(site)s account" msgstr "Recupera la cuenta de %(site)s" -#: deps/django_authopenid/views.py:1159 +#: deps/django_authopenid/views.py:1155 msgid "Please check your email and visit the enclosed link." msgstr "Por favor, comprueba tu email y visita el enlace." @@ -2980,21 +2998,6 @@ msgstr "Expandir todo" msgid "Congratulations, you are now an Administrator" msgstr "Enhorabuena, eres Administrador" -#: management/commands/initialize_ldap_logins.py:51 -msgid "" -"This command may help you migrate to LDAP password authentication by " -"creating a record for LDAP association with each user account. There is an " -"assumption that ldap user id's are the same as user names registered at the " -"site. Before running this command it is necessary to set up LDAP parameters " -"in the \"External keys\" section of the site settings." -msgstr "" -"Este comando puede ayudarte a migrar el sistema de autentificación de " -"contraseñas LDAP creando un registro de asociación con cada cuenta de " -"usaurio. Se supone que el user id de LDAP es el mismo que los usuarios " -"registrados en el sitio. Antes de ejecutar este comando es necesario " -"configurar los parámetros de LDAP en la sección \"Llaves externas\" de los " -"ajustes del sitio." - #: management/commands/post_emailed_questions.py:35 msgid "" "<p>To ask by email, please:</p>\n" @@ -3886,12 +3889,12 @@ msgstr "\" y \"%s\"" msgid "\" and more" msgstr "\" y más" -#: models/repute.py:141 +#: models/repute.py:143 #, python-format msgid "<em>Changed by moderator. Reason:</em> %(reason)s" msgstr "<em>Cambio del moderador. Motivo:</em> %(reason)s" -#: models/repute.py:152 +#: models/repute.py:154 #, python-format msgid "" "%(points)s points were added for %(username)s's contribution to question " @@ -3900,7 +3903,7 @@ msgstr "" "%(points)s puntos se añadieron a tu usuario %(username)s por la pregunta " "%(question_title)s" -#: models/repute.py:157 +#: models/repute.py:159 #, python-format msgid "" "%(points)s points were subtracted for %(username)s's contribution to " @@ -4019,7 +4022,7 @@ msgstr "Guardar Email" #: skins/default/templates/question_retag.html:22 #: skins/default/templates/reopen.html:27 #: skins/default/templates/subscribe_for_tags.html:16 -#: skins/default/templates/user_profile/user_edit.html:103 +#: skins/default/templates/user_profile/user_edit.html:102 msgid "Cancel" msgstr "Cancelar" @@ -5413,8 +5416,8 @@ msgid "responses for %(username)s" msgstr "respuestas a %(username)s" #: skins/default/templates/macros.html:606 -#, python-format -msgid "you have a new response" +#, fuzzy, python-format +msgid "you have %(response_count)s new response" msgid_plural "you have %(response_count)s new responses" msgstr[0] "tienes una nueva respuesta" msgstr[1] "tienes %(response_count)s nuevas respuestas" @@ -6004,11 +6007,11 @@ msgstr "Usuario registrado" msgid "Screen Name" msgstr "Nombre para mostrar" -#: skins/default/templates/user_profile/user_edit.html:60 +#: skins/default/templates/user_profile/user_edit.html:59 msgid "(cannot be changed)" msgstr "(no puede modificarse)" -#: skins/default/templates/user_profile/user_edit.html:102 +#: skins/default/templates/user_profile/user_edit.html:101 #: skins/default/templates/user_profile/user_email_subscriptions.html:22 msgid "Update" msgstr "Actualizar" @@ -6364,7 +6367,7 @@ msgstr "Respuesta a:" msgid "User profile" msgstr "Pefil de usuario" -#: skins/default/templates/user_profile/user_tabs.html:10 views/users.py:630 +#: skins/default/templates/user_profile/user_tabs.html:10 views/users.py:638 msgid "comments and answers to others questions" msgstr "comentar y responder otras preguntas" @@ -6381,11 +6384,11 @@ msgstr "grafica de la reputación de este usuario" msgid "questions that user is following" msgstr "preguntas que el usuario esta siguiendo" -#: skins/default/templates/user_profile/user_tabs.html:34 views/users.py:671 +#: skins/default/templates/user_profile/user_tabs.html:34 views/users.py:679 msgid "user vote record" msgstr "registro de votos de este usuario" -#: skins/default/templates/user_profile/user_tabs.html:40 views/users.py:761 +#: skins/default/templates/user_profile/user_tabs.html:40 views/users.py:769 msgid "email subscription settings" msgstr "configuraciones de suscripción por email" @@ -6840,57 +6843,57 @@ msgstr "" msgid "moderate user" msgstr "moderar usuario" -#: views/users.py:373 +#: views/users.py:381 msgid "user profile" msgstr "perfil de usuario" -#: views/users.py:374 +#: views/users.py:382 msgid "user profile overview" msgstr "vista del perfil de usuario" -#: views/users.py:543 +#: views/users.py:551 msgid "recent user activity" msgstr "actividad reciente del usuario" -#: views/users.py:544 +#: views/users.py:552 msgid "profile - recent activity" msgstr "perfil - actividad reciente" -#: views/users.py:631 +#: views/users.py:639 msgid "profile - responses" msgstr "perfil - respuestas" -#: views/users.py:672 +#: views/users.py:680 msgid "profile - votes" msgstr "pefil - votos" -#: views/users.py:693 +#: views/users.py:701 #, fuzzy msgid "user karma" msgstr "karma" -#: views/users.py:694 +#: views/users.py:702 #, fuzzy msgid "Profile - User's Karma" msgstr "perfil - reputación del usuario" -#: views/users.py:712 +#: views/users.py:720 msgid "users favorite questions" msgstr "preguntas favoritas del usuario" -#: views/users.py:713 +#: views/users.py:721 msgid "profile - favorite questions" msgstr "pefil - preguntas favoritas" -#: views/users.py:733 views/users.py:737 +#: views/users.py:741 views/users.py:745 msgid "changes saved" msgstr "cambios guardados" -#: views/users.py:743 +#: views/users.py:751 msgid "email updates canceled" msgstr "notificaciones por email cancelada" -#: views/users.py:762 +#: views/users.py:770 msgid "profile - email subscriptions" msgstr "perfil - notificación por email" @@ -6953,6 +6956,26 @@ msgstr "" msgid "sorry, we seem to have some technical difficulties" msgstr "lo sentimos, tenemos dificultades técnicas" +#~ msgid "URL for the LDAP service" +#~ msgstr "URL del servicio LDAP" + +#~ msgid "Explain how to change LDAP password" +#~ msgstr "Explicar cómo cambiar el password LDAP" + +#~ msgid "" +#~ "This command may help you migrate to LDAP password authentication by " +#~ "creating a record for LDAP association with each user account. There is " +#~ "an assumption that ldap user id's are the same as user names registered " +#~ "at the site. Before running this command it is necessary to set up LDAP " +#~ "parameters in the \"External keys\" section of the site settings." +#~ msgstr "" +#~ "Este comando puede ayudarte a migrar el sistema de autentificación de " +#~ "contraseñas LDAP creando un registro de asociación con cada cuenta de " +#~ "usaurio. Se supone que el user id de LDAP es el mismo que los usuarios " +#~ "registrados en el sitio. Antes de ejecutar este comando es necesario " +#~ "configurar los parámetros de LDAP en la sección \"Llaves externas\" de " +#~ "los ajustes del sitio." + #~ msgid "use-these-chars-in-tags" #~ msgstr "usa-estos-caracteres-en-las-etiquetas" @@ -7000,11 +7023,11 @@ msgstr "lo sentimos, tenemos dificultades técnicas" #~ "go to %(email_settings_link)s to change frequency of email updates or " #~ "%(admin_email)s administrator" #~ msgstr "" -#~ "<p>Por favor, recuerda que siempre puedes <a " -#~ "href='%(email_settings_link)s'>adjustar</a> la frecuencia de las " -#~ "actualizaciones al email o desactivarlas completamente.<br/>Si piensas " -#~ "que este mensaje te ha llegado por error, por favor, envíalo al " -#~ "administrador del sitio a %(admin_email)s.</p><p>Saludos,</p>" +#~ "<p>Por favor, recuerda que siempre puedes <a href='%(email_settings_link)" +#~ "s'>adjustar</a> la frecuencia de las actualizaciones al email o " +#~ "desactivarlas completamente.<br/>Si piensas que este mensaje te ha " +#~ "llegado por error, por favor, envíalo al administrador del sitio a " +#~ "%(admin_email)s.</p><p>Saludos,</p>" #~ msgid "" #~ "uploading images is limited to users with >%(min_rep)s reputation points" @@ -7074,8 +7097,8 @@ msgstr "lo sentimos, tenemos dificultades técnicas" #~ msgstr "" #~ "<span class=\"strong big\">Introduce el nuevo email en la caja de abajo</" #~ "span> si quieres utilizar otro email para <strong>actualizar tus " -#~ "suscripciones</strong>.<br>Ahora estás usando este email: <strong>" -#~ "%(email)s</strong>" +#~ "suscripciones</strong>.<br>Ahora estás usando este email: <strong>%(email)" +#~ "s</strong>" #~ msgid "here is why email is required, see %(gravatar_faq_url)s" #~ msgstr "" @@ -7093,19 +7116,19 @@ msgstr "lo sentimos, tenemos dificultades técnicas" #~ msgid "validate %(email)s info or go to %(change_email_url)s" #~ msgstr "" -#~ "<span class=\"strong big\">Hemos enviado un email de validación a " -#~ "%(email)s.</span> Por favor <strong>comprueba el email enviado</strong> " -#~ "con tu navegador. Es necesario que validemos tu email para asegurarlos " -#~ "que realizas un uso correcto de tu cuenta en este sitio. Si quieres " -#~ "utilizar <strong>otro email</strong>, por favor<a " -#~ "href='%(change_email_url)s'><strong>cámbialo desde aquí</strong></a>." +#~ "<span class=\"strong big\">Hemos enviado un email de validación a %(email)" +#~ "s.</span> Por favor <strong>comprueba el email enviado</strong> con tu " +#~ "navegador. Es necesario que validemos tu email para asegurarlos que " +#~ "realizas un uso correcto de tu cuenta en este sitio. Si quieres utilizar " +#~ "<strong>otro email</strong>, por favor<a href='%(change_email_url)" +#~ "s'><strong>cámbialo desde aquí</strong></a>." #~ msgid "old %(email)s kept, if you like go to %(change_email_url)s" #~ msgstr "" #~ "<span class=\"strong big\">Tu email %(email)s no ha sido modificado.</" #~ "span> Si decides cambiarlo más tarde - siempre puedes hacerlo editándolo " -#~ "en tu perfil o usando el anterior <a " -#~ "href='%(change_email_url)s'><strong>formulario</strong></a> otra vez." +#~ "en tu perfil o usando el anterior <a href='%(change_email_url)" +#~ "s'><strong>formulario</strong></a> otra vez." #~ msgid "your current %(email)s can be used for this" #~ msgstr "" @@ -7138,8 +7161,8 @@ msgstr "lo sentimos, tenemos dificultades técnicas" #~ "%(provider)s.</span> Por favor, crea tu <strong>usuario</strong> y guarda " #~ "tu <strong>email</strong>. El email te permitirá <strong>suscribirte a " #~ "las actualizaciones</strong> de las preguntas más interesantes y será " -#~ "usada para crear y recuperar tu imagen de <a " -#~ "href='%(gravatar_faq_url)s'><strong>gravatar</strong></a>.</p>" +#~ "usada para crear y recuperar tu imagen de <a href='%(gravatar_faq_url)" +#~ "s'><strong>gravatar</strong></a>.</p>" #~ msgid "" #~ "%(username)s already exists, choose another name for \n" @@ -7151,11 +7174,11 @@ msgstr "lo sentimos, tenemos dificultades técnicas" #~ "%(username)s ya ha sido registrado.</span></p><p>Por favor elige otro " #~ "nombre de usuario para utilizar en tu cuenta de %(provider)s. Debes " #~ "introducir un correo válido para darte de alta en este sitio. Tu email " -#~ "será utilizado para crear un <a " -#~ "href='%(gravatar_faq_url)s'><strong>gravatar</strong></a> con imagen en " -#~ "tu cuenta. Si lo deseas puedes <strong>recibir actualizaciones</strong> " -#~ "de las preguntas más interesantes por email. Bajo ningún concepto los " -#~ "emails se mostrarán a terceros ni se compartirán con ningún otro fin.</p>" +#~ "será utilizado para crear un <a href='%(gravatar_faq_url)" +#~ "s'><strong>gravatar</strong></a> con imagen en tu cuenta. Si lo deseas " +#~ "puedes <strong>recibir actualizaciones</strong> de las preguntas más " +#~ "interesantes por email. Bajo ningún concepto los emails se mostrarán a " +#~ "terceros ni se compartirán con ningún otro fin.</p>" #~ msgid "" #~ "register new external %(provider)s account info, see %(gravatar_faq_url)s" @@ -7164,9 +7187,8 @@ msgstr "lo sentimos, tenemos dificultades técnicas" #~ "span></p><p>Puedes guardar tu <strong>nombre de usuario</strong> y " #~ "también tu cuenta de %(provider)s o elegir otro apodo.</p><p>Debes " #~ "introducir un correo válido para darte de alta en este sitio. Tu email " -#~ "será utilizado para crear un <a " -#~ "href='%(gravatar_faq_url)s'><strong>gravatar</strong></a> con imagen en " -#~ "tu cuenta. .</p>" +#~ "será utilizado para crear un <a href='%(gravatar_faq_url)" +#~ "s'><strong>gravatar</strong></a> con imagen en tu cuenta. .</p>" #~ msgid "register new Facebook connect account info, see %(gravatar_faq_url)s" #~ msgstr "" diff --git a/askbot/locale/hi/LC_MESSAGES/django.po b/askbot/locale/hi/LC_MESSAGES/django.po index 484019da..244f760d 100644 --- a/askbot/locale/hi/LC_MESSAGES/django.po +++ b/askbot/locale/hi/LC_MESSAGES/django.po @@ -1,21 +1,22 @@ # English translation for CNPROG package. # Copyright (C) 2009 Gang Chen, 2010 Askbot # This file is distributed under the same license as the CNPROG package. -# +# # Translators: # Chandan kumar <chandankumar.093047@gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: askbot\n" -"Report-Msgid-Bugs-To: http://askbot.org/\n" -"POT-Creation-Date: 2012-02-21 16:37-0600\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-03-11 22:43-0500\n" "PO-Revision-Date: 2012-03-02 09:48+0000\n" "Last-Translator: Chandan kumar <chandankumar.093047@gmail.com>\n" -"Language-Team: Hindi (http://www.transifex.net/projects/p/askbot/language/hi/)\n" +"Language-Team: Hindi (http://www.transifex.net/projects/p/askbot/language/" +"hi/)\n" +"Language: hi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: hi\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" #: exceptions.py:13 @@ -57,24 +58,34 @@ msgstr "शीर्षक" msgid "please enter a descriptive title for your question" msgstr "कृपया अपने प्रश्न के लिए एक विवरणात्मक शीर्षक दर्ज करें" -#: forms.py:111 +#: forms.py:113 #, python-format msgid "title must be > %d character" msgid_plural "title must be > %d characters" msgstr[0] "" msgstr[1] "" -#: forms.py:131 +#: forms.py:123 +#, python-format +msgid "The title is too long, maximum allowed size is %d characters" +msgstr "" + +#: forms.py:130 +#, python-format +msgid "The title is too long, maximum allowed size is %d bytes" +msgstr "" + +#: forms.py:149 msgid "content" msgstr "सामग्री" -#: forms.py:165 skins/common/templates/widgets/edit_post.html:20 +#: forms.py:185 skins/common/templates/widgets/edit_post.html:20 #: skins/common/templates/widgets/edit_post.html:32 #: skins/default/templates/widgets/meta_nav.html:5 msgid "tags" msgstr "लेबल " -#: forms.py:168 +#: forms.py:188 #, python-format msgid "" "Tags are short keywords, with no spaces within. Up to %(max_tags)d tag can " @@ -85,243 +96,258 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: forms.py:201 skins/default/templates/question_retag.html:58 +#: forms.py:221 skins/default/templates/question_retag.html:58 msgid "tags are required" msgstr "लेबल की आवश्यकता" -#: forms.py:210 +#: forms.py:230 #, python-format msgid "please use %(tag_count)d tag or less" msgid_plural "please use %(tag_count)d tags or less" msgstr[0] "कृपया %(tag_count)d लेबल या कम का उपयोग करें" msgstr[1] "कृपया %(tag_count)d लेबल या कम का उपयोग करें" -#: forms.py:218 +#: forms.py:238 #, python-format msgid "At least one of the following tags is required : %(tags)s" msgstr "कम से कम निम्नलिखित टैग की आवश्यकता है: %(tags)s" -#: forms.py:227 +#: forms.py:247 #, python-format msgid "each tag must be shorter than %(max_chars)d character" msgid_plural "each tag must be shorter than %(max_chars)d characters" msgstr[0] "प्रत्येक लेबल %(max_chars)d अक्षरों से कम होना चाहिए" msgstr[1] "प्रत्येक लेबल %(max_chars)d अक्षरों से कम होना चाहिए" -#: forms.py:235 -msgid "use-these-chars-in-tags" -msgstr " टैग-में-इन-अक्षरों-का-उपयोग-करें" +#: forms.py:256 +msgid "In tags, please use letters, numbers and characters \"-+.#\"" +msgstr "" -#: forms.py:270 +#: forms.py:292 msgid "community wiki (karma is not awarded & many others can edit wiki post)" -msgstr "सामुदायिक विकी (कर्मा से नहीं सम्मानित किया जायेगा और कई अन्य विकि पोस्ट को संपादित कर सकते हैं)" +msgstr "" +"सामुदायिक विकी (कर्मा से नहीं सम्मानित किया जायेगा और कई अन्य विकि पोस्ट को संपादित " +"कर सकते हैं)" -#: forms.py:271 +#: forms.py:293 msgid "" -"if you choose community wiki option, the question and answer do not generate" -" points and name of author will not be shown" -msgstr "अगर आप सामुदायिक विकी विकल्प को चुनते हैं,सवाल और जवाब अंकों को उत्पन्न नहीं करते है और लेखक का नाम नहीं दिखाया जाएगा" +"if you choose community wiki option, the question and answer do not generate " +"points and name of author will not be shown" +msgstr "" +"अगर आप सामुदायिक विकी विकल्प को चुनते हैं,सवाल और जवाब अंकों को उत्पन्न नहीं करते है और " +"लेखक का नाम नहीं दिखाया जाएगा" -#: forms.py:287 +#: forms.py:309 msgid "update summary:" msgstr "सारांश अद्यतन:" -#: forms.py:288 +#: forms.py:310 msgid "" "enter a brief summary of your revision (e.g. fixed spelling, grammar, " "improved style, this field is optional)" -msgstr "अपने पुनरीक्षण का संक्षिप्त सार दर्ज करें(उदाहरण के लिए नियत वर्तनी, व्याकरण, शैली में सुधार, यह फ़ील्ड वैकल्पिक है)" +msgstr "" +"अपने पुनरीक्षण का संक्षिप्त सार दर्ज करें(उदाहरण के लिए नियत वर्तनी, व्याकरण, शैली में " +"सुधार, यह फ़ील्ड वैकल्पिक है)" -#: forms.py:362 +#: forms.py:384 msgid "Enter number of points to add or subtract" msgstr "जोड़ने या घटाना के लिए अंकों की संख्या को दर्ज करे " -#: forms.py:376 const/__init__.py:247 +#: forms.py:398 const/__init__.py:253 msgid "approved" msgstr "स्वीकृत" -#: forms.py:377 const/__init__.py:248 +#: forms.py:399 const/__init__.py:254 msgid "watched" msgstr "देखते रहे " -#: forms.py:378 const/__init__.py:249 +#: forms.py:400 const/__init__.py:255 msgid "suspended" msgstr "निलंबित" -#: forms.py:379 const/__init__.py:250 +#: forms.py:401 const/__init__.py:256 msgid "blocked" msgstr "अवरोधित" -#: forms.py:381 +#: forms.py:403 msgid "administrator" msgstr "ऐडमिनिस्ट्रेटर" -#: forms.py:382 const/__init__.py:246 +#: forms.py:404 const/__init__.py:252 msgid "moderator" msgstr "मध्यस्थ" -#: forms.py:402 +#: forms.py:424 msgid "Change status to" msgstr "स्थिति को बदलने के लिए " -#: forms.py:429 +#: forms.py:451 msgid "which one?" msgstr "एक है जो?" -#: forms.py:450 +#: forms.py:472 msgid "Cannot change own status" msgstr "अपनी स्थिति को नहीं बदल सकते हैं" -#: forms.py:456 +#: forms.py:478 msgid "Cannot turn other user to moderator" msgstr "अन्य उपयोगकर्ता को मध्यस्थ नहीं बना सकते है" -#: forms.py:463 +#: forms.py:485 msgid "Cannot change status of another moderator" msgstr "दूसरे मध्यस्थ की स्थिति को परिवर्तित नहीं सकते हैं" -#: forms.py:469 +#: forms.py:491 msgid "Cannot change status to admin" msgstr "एडमिन की स्थिति को परिवर्तित नहीं कर सकते हैं" -#: forms.py:475 +#: forms.py:497 #, python-format msgid "" "If you wish to change %(username)s's status, please make a meaningful " "selection." -msgstr "यदि आप %(username)s की स्थिति में परिवर्तन करना चाहते हैं,कृपया एक अर्थपूर्ण चुनाव करें." +msgstr "" +"यदि आप %(username)s की स्थिति में परिवर्तन करना चाहते हैं,कृपया एक अर्थपूर्ण चुनाव करें." -#: forms.py:484 +#: forms.py:506 msgid "Subject line" msgstr "विषय पंक्ति" -#: forms.py:491 +#: forms.py:513 msgid "Message text" msgstr "संदेश पाठ" -#: forms.py:506 +#: forms.py:528 msgid "Your name (optional):" msgstr "" -#: forms.py:507 +#: forms.py:529 msgid "Email:" msgstr "" -#: forms.py:509 +#: forms.py:531 msgid "Your message:" msgstr "आपका संदेश:" -#: forms.py:514 +#: forms.py:536 msgid "I don't want to give my email or receive a response:" msgstr "" -#: forms.py:536 +#: forms.py:558 msgid "Please mark \"I dont want to give my mail\" field." msgstr "" -#: forms.py:575 +#: forms.py:597 msgid "ask anonymously" msgstr "गुमनाम रूप से पूछना" -#: forms.py:577 +#: forms.py:599 msgid "Check if you do not want to reveal your name when asking this question" msgstr "जाँच करें यदि आप सवाल पूछते समय अपना नाम प्रकट नहीं करना चाहते है" -#: forms.py:737 +#: forms.py:752 msgid "" "You have asked this question anonymously, if you decide to reveal your " "identity, please check this box." -msgstr "आपने गुमनाम रूप से इस प्रश्न को पूछा है,यदि आप अपनी पहचान को उजागर करने का निर्णय लेते हैं,इस बॉक्स की जाँच करें." +msgstr "" +"आपने गुमनाम रूप से इस प्रश्न को पूछा है,यदि आप अपनी पहचान को उजागर करने का निर्णय लेते " +"हैं,इस बॉक्स की जाँच करें." -#: forms.py:741 +#: forms.py:756 msgid "reveal identity" msgstr "पहचान प्रकट करे " -#: forms.py:799 +#: forms.py:814 msgid "" "Sorry, only owner of the anonymous question can reveal his or her identity, " "please uncheck the box" -msgstr "क्षमा करें, केवल अज्ञात प्रश्न के पूछने वाला ही अपने या उसकी पहचान को बता सकते हैं,कृपया बॉक्स को अचयनित करे " +msgstr "" +"क्षमा करें, केवल अज्ञात प्रश्न के पूछने वाला ही अपने या उसकी पहचान को बता सकते हैं,कृपया " +"बॉक्स को अचयनित करे " -#: forms.py:812 +#: forms.py:827 msgid "" "Sorry, apparently rules have just changed - it is no longer possible to ask " "anonymously. Please either check the \"reveal identity\" box or reload this " "page and try editing the question again." -msgstr "क्षमा करें, जाहिर तौर पर नियमों को बदल दिए गए हैं -गुमनाम रूप से पूछना अब संभव नहीं है. कृपया \"पहचान प्रकट\" बॉक्स की जाँच करें या इस पृष्ठ को पुनः लोड करे और सवाल को फिर से संपादन करने की कोशिश करे ." +msgstr "" +"क्षमा करें, जाहिर तौर पर नियमों को बदल दिए गए हैं -गुमनाम रूप से पूछना अब संभव नहीं है. " +"कृपया \"पहचान प्रकट\" बॉक्स की जाँच करें या इस पृष्ठ को पुनः लोड करे और सवाल को फिर से " +"संपादन करने की कोशिश करे ." -#: forms.py:856 +#: forms.py:871 msgid "Real name" msgstr "असली नाम" -#: forms.py:863 +#: forms.py:878 msgid "Website" msgstr "वेबसाइट" -#: forms.py:870 +#: forms.py:885 msgid "City" msgstr "शहर" -#: forms.py:879 +#: forms.py:894 msgid "Show country" msgstr "देश दिखाएँ" -#: forms.py:884 +#: forms.py:899 msgid "Date of birth" msgstr "जन्म तिथि" -#: forms.py:885 +#: forms.py:900 msgid "will not be shown, used to calculate age, format: YYYY-MM-DD" msgstr "नहीं दिखाया जाएगा,उम्र की गणना करने के लिए उपयोग किया,प्रारूप : YYYY-MM-DD" -#: forms.py:891 +#: forms.py:906 msgid "Profile" msgstr "रूपरेखा" -#: forms.py:900 +#: forms.py:915 msgid "Screen name" msgstr "स्क्रीन नाम" -#: forms.py:931 forms.py:932 +#: forms.py:946 forms.py:947 msgid "this email has already been registered, please use another one" msgstr "यह ईमेल पहले से ही पंजीकृत किया गया है,कृपया एक दूसरे उपयोग करें" -#: forms.py:939 +#: forms.py:954 msgid "Choose email tag filter" msgstr "ईमेल टैग फिल्टर चुनें" -#: forms.py:986 +#: forms.py:1001 msgid "Asked by me" msgstr "मेरे द्वारा पूछा गया" -#: forms.py:989 +#: forms.py:1004 msgid "Answered by me" msgstr "मेरे द्वारा उत्तर दिया गया " -#: forms.py:992 +#: forms.py:1007 msgid "Individually selected" msgstr "व्यक्तिगत रूप से चयनित" -#: forms.py:995 +#: forms.py:1010 msgid "Entire forum (tag filtered)" msgstr "संपूर्ण फोरम (फ़िल्टर्ड टैग)" -#: forms.py:999 +#: forms.py:1014 msgid "Comments and posts mentioning me" msgstr "टिप्पणियाँ और प्रविष्टियाँ मुझे उल्लेखित करती है" -#: forms.py:1077 +#: forms.py:1095 +msgid "please choose one of the options above" +msgstr "उपरोक्त विकल्पों में से एक का चयन करें" + +#: forms.py:1098 msgid "okay, let's try!" msgstr "ठीक है,चलो कोशिश करे!" -#: forms.py:1078 -msgid "no community email please, thanks" +#: forms.py:1101 +#, fuzzy, python-format +msgid "no %(sitename)s email please, thanks" msgstr "कोई askbot ईमेल नहीं है कृपया, धन्यवाद" -#: forms.py:1082 -msgid "please choose one of the options above" -msgstr "उपरोक्त विकल्पों में से एक का चयन करें" - #: urls.py:41 msgid "about/" msgstr "about/" @@ -342,7 +368,7 @@ msgstr "help/" msgid "answers/" msgstr "answers/" -#: urls.py:46 urls.py:87 urls.py:207 +#: urls.py:46 urls.py:87 urls.py:212 msgid "edit/" msgstr "edit/" @@ -355,7 +381,7 @@ msgid "questions" msgstr "प्रश्नों " #: urls.py:82 urls.py:87 urls.py:92 urls.py:97 urls.py:102 urls.py:107 -#: urls.py:112 urls.py:117 urls.py:123 urls.py:294 +#: urls.py:112 urls.py:117 urls.py:123 urls.py:299 msgid "questions/" msgstr "questions/" @@ -387,51 +413,51 @@ msgstr "vote/" msgid "widgets/" msgstr "widgets/" -#: urls.py:153 +#: urls.py:158 msgid "tags/" msgstr "tags/" -#: urls.py:196 +#: urls.py:201 msgid "subscribe-for-tags/" msgstr "subscribe-for-tags/" -#: urls.py:201 urls.py:207 urls.py:213 urls.py:221 +#: urls.py:206 urls.py:212 urls.py:218 urls.py:226 msgid "users/" msgstr "users/" -#: urls.py:214 +#: urls.py:219 msgid "subscriptions/" msgstr "subscriptions/" -#: urls.py:226 +#: urls.py:231 msgid "users/update_has_custom_avatar/" msgstr "users/update_has_custom_avatar/" -#: urls.py:231 urls.py:236 +#: urls.py:236 urls.py:241 msgid "badges/" msgstr "badges/" -#: urls.py:241 +#: urls.py:246 msgid "messages/" msgstr "messages/" -#: urls.py:241 +#: urls.py:246 msgid "markread/" msgstr "markread/" -#: urls.py:257 +#: urls.py:262 msgid "upload/" msgstr "upload/" -#: urls.py:258 +#: urls.py:263 msgid "feedback/" msgstr "feedback/" -#: urls.py:300 +#: urls.py:305 msgid "question/" msgstr "question/" -#: urls.py:307 setup_templates/settings.py:210 +#: urls.py:312 setup_templates/settings.py:210 #: skins/common/templates/authopenid/providers_javascript.html:7 msgid "account/" msgstr "account/" @@ -556,153 +582,167 @@ msgstr "ईमेल के विषय पंक्ति के लिए उ msgid "" "This setting takes default from the django settingEMAIL_SUBJECT_PREFIX. A " "value entered here will overridethe default." -msgstr "यह EMAIL_SUBJECT_PREFIX django सेटिंग से डिफ़ॉल्ट सेटिंग लेता है.दर्ज किया गया मान से डिफ़ॉल्ट के ऊपर लिख देगा." +msgstr "" +"यह EMAIL_SUBJECT_PREFIX django सेटिंग से डिफ़ॉल्ट सेटिंग लेता है.दर्ज किया गया मान से " +"डिफ़ॉल्ट के ऊपर लिख देगा." #: conf/email.py:38 +#, fuzzy +msgid "Enable email alerts" +msgstr "ईमेल और ईमेल चेतावनी सेटिंग" + +#: conf/email.py:47 msgid "Maximum number of news entries in an email alert" msgstr "ईमेल चेतावनी में समाचार प्रविष्टियों की अधिकतम संख्या" -#: conf/email.py:48 +#: conf/email.py:57 msgid "Default notification frequency all questions" msgstr "व्यतिक्रम अधिसूचना सारे प्रश्नों की आवृत्ति करता है" -#: conf/email.py:50 +#: conf/email.py:59 msgid "Option to define frequency of emailed updates for: all questions." msgstr "सभी सवालों: के लिए ईमेल की अद्यतन की आवृत्ति को परिभाषित करने का विकल्प होगा." -#: conf/email.py:62 +#: conf/email.py:71 msgid "Default notification frequency questions asked by the user" msgstr "उपयोगकर्ता द्वारा पूछे जाने वाले प्रश्नों के व्यतिक्रम अधिसूचना की आवृत्ति" -#: conf/email.py:64 +#: conf/email.py:73 msgid "" "Option to define frequency of emailed updates for: Question asked by the " "user." -msgstr "उपयोगकर्ता द्वारा पूछे जाने वाले सभी प्रश्नों : के लिए ईमेल की अद्यतन की आवृत्ति को परिभाषित करने का विकल्प होगा." +msgstr "" +"उपयोगकर्ता द्वारा पूछे जाने वाले सभी प्रश्नों : के लिए ईमेल की अद्यतन की आवृत्ति को " +"परिभाषित करने का विकल्प होगा." -#: conf/email.py:76 +#: conf/email.py:85 msgid "Default notification frequency questions answered by the user" msgstr "उपयोगकर्ता द्वारा सवालों के जवाब की व्यतिक्रम अधिसूचना की आवृत्ति" -#: conf/email.py:78 +#: conf/email.py:87 msgid "" "Option to define frequency of emailed updates for: Question answered by the " "user." -msgstr "उपयोगकर्ता द्वारा सवालों के जवाब : के लिए ईमेल की अद्यतन की आवृत्ति को परिभाषित करने का विकल्प होगा." +msgstr "" +"उपयोगकर्ता द्वारा सवालों के जवाब : के लिए ईमेल की अद्यतन की आवृत्ति को परिभाषित करने " +"का विकल्प होगा." -#: conf/email.py:90 +#: conf/email.py:99 msgid "" -"Default notification frequency questions individually" -" selected by the user" +"Default notification frequency questions individually " +"selected by the user" msgstr "" -#: conf/email.py:93 +#: conf/email.py:102 msgid "" "Option to define frequency of emailed updates for: Question individually " "selected by the user." msgstr "" -#: conf/email.py:105 +#: conf/email.py:114 msgid "" "Default notification frequency for mentions and " "comments" msgstr "" -#: conf/email.py:108 +#: conf/email.py:117 msgid "" "Option to define frequency of emailed updates for: Mentions and comments." msgstr "" -#: conf/email.py:119 +#: conf/email.py:128 msgid "Send periodic reminders about unanswered questions" msgstr "अनुत्तरित प्रश्नों के बारे में आवर्ती अनुस्मारकों को भेजें" -#: conf/email.py:121 +#: conf/email.py:130 msgid "" "NOTE: in order to use this feature, it is necessary to run the management " "command \"send_unanswered_question_reminders\" (for example, via a cron job " "- with an appropriate frequency) " msgstr "" -#: conf/email.py:134 +#: conf/email.py:143 msgid "Days before starting to send reminders about unanswered questions" msgstr "पहले दिनों में अनुत्तरित प्रश्नों के बारे में अनुस्मारक भेजना शुरू करे" -#: conf/email.py:145 +#: conf/email.py:154 msgid "" "How often to send unanswered question reminders (in days between the " "reminders sent)." msgstr "अनुत्तरित प्रश्न अनुस्मारकों को कितनी बार भेजे (दिनों के बीच में अनुस्मारकों को भेजे)." -#: conf/email.py:157 +#: conf/email.py:166 msgid "Max. number of reminders to send about unanswered questions" msgstr "अनुत्तरित प्रश्नों के बारे में भेजे गए अनुस्मारकों की अधिकतम संख्या" -#: conf/email.py:168 +#: conf/email.py:177 msgid "Send periodic reminders to accept the best answer" msgstr "" -#: conf/email.py:170 +#: conf/email.py:179 msgid "" "NOTE: in order to use this feature, it is necessary to run the management " -"command \"send_accept_answer_reminders\" (for example, via a cron job - with" -" an appropriate frequency) " +"command \"send_accept_answer_reminders\" (for example, via a cron job - with " +"an appropriate frequency) " msgstr "" -#: conf/email.py:183 +#: conf/email.py:192 msgid "Days before starting to send reminders to accept an answer" msgstr "" -#: conf/email.py:194 +#: conf/email.py:203 msgid "" "How often to send accept answer reminders (in days between the reminders " "sent)." msgstr "" -#: conf/email.py:206 +#: conf/email.py:215 msgid "Max. number of reminders to send to accept the best answer" msgstr "" -#: conf/email.py:218 +#: conf/email.py:227 msgid "Require email verification before allowing to post" msgstr "पास पोस्ट करने के लिए अनुमति देने से पहले ईमेल के सत्यापन की आवश्यकता है" -#: conf/email.py:219 +#: conf/email.py:228 msgid "" "Active email verification is done by sending a verification key in email" msgstr "सक्रिय ईमेल सत्यापन ईमेल में एक सत्यापन कुंजी भेजकर किया जाता है" -#: conf/email.py:228 +#: conf/email.py:237 msgid "Allow only one account per email address" msgstr "ईमेल पते के प्रति केवल एक खाते की अनुमति दें" -#: conf/email.py:237 +#: conf/email.py:246 msgid "Fake email for anonymous user" msgstr "अज्ञात उपयोगकर्ता के लिए फर्जी ईमेल" -#: conf/email.py:238 +#: conf/email.py:247 msgid "Use this setting to control gravatar for email-less user" -msgstr "कम ईमेल उपयोगकर्ता के लिए gravatar को नियंत्रित करने के लिए इस सेटिंग का उपयोग करे " +msgstr "" +"कम ईमेल उपयोगकर्ता के लिए gravatar को नियंत्रित करने के लिए इस सेटिंग का उपयोग करे " -#: conf/email.py:247 +#: conf/email.py:256 msgid "Allow posting questions by email" msgstr "ईमेल के द्वारा प्रश्नों के पोस्ट करने की अनुमति" -#: conf/email.py:249 +#: conf/email.py:258 msgid "" -"Before enabling this setting - please fill out IMAP settings in the " -"settings.py file" -msgstr "इस सेटिंग को सक्षम करने से पहले -कृपया settings.py फ़ाइल में IMAP सेटिंग को पहले भरे " +"Before enabling this setting - please fill out IMAP settings in the settings." +"py file" +msgstr "" +"इस सेटिंग को सक्षम करने से पहले -कृपया settings.py फ़ाइल में IMAP सेटिंग को पहले भरे " -#: conf/email.py:260 +#: conf/email.py:269 msgid "Replace space in emailed tags with dash" msgstr "ईमेल टैग्स में स्थान को डैश से बदलें" -#: conf/email.py:262 +#: conf/email.py:271 msgid "" "This setting applies to tags written in the subject line of questions asked " "by email" -msgstr "यह सेटिंग ईमेल द्वारा अधिसूचित प्रश्नों के विषय पंक्ति में लिखा टैग के लिए लागू होता है " +msgstr "" +"यह सेटिंग ईमेल द्वारा अधिसूचित प्रश्नों के विषय पंक्ति में लिखा टैग के लिए लागू होता है " #: conf/external_keys.py:11 msgid "Keys for external services" @@ -715,9 +755,11 @@ msgstr "गूगल साइट सत्यापन कुंजी" #: conf/external_keys.py:21 #, python-format msgid "" -"This key helps google index your site please obtain is at <a " -"href=\"%(url)s?hl=%(lang)s\">google webmasters tools site</a>" -msgstr "यह कुंजी गूगल को आपकी साइट का सूचकांक करने में मदद करता है कृपया <a href=\"%(url)s?hl=%(lang)s\">गुगल वेबमास्टर्स उपकरण साइट</a> से प्राप्त करे " +"This key helps google index your site please obtain is at <a href=\"%(url)s?" +"hl=%(lang)s\">google webmasters tools site</a>" +msgstr "" +"यह कुंजी गूगल को आपकी साइट का सूचकांक करने में मदद करता है कृपया <a href=\"%(url)s?hl=" +"%(lang)s\">गुगल वेबमास्टर्स उपकरण साइट</a> से प्राप्त करे " #: conf/external_keys.py:36 msgid "Google Analytics key" @@ -728,105 +770,101 @@ msgstr "गूगल विश्लेषिकी कुंजी" msgid "" "Obtain is at <a href=\"%(url)s\">Google Analytics</a> site, if you wish to " "use Google Analytics to monitor your site" -msgstr "<a href=\"%(url)s\">गूगल विश्लेषिकी</a> साईट पर प्राप्त करे,अगर आप गूगल विश्लेषिकी का उपयोग करके अपनी साइट की निगरानी करना चाहते हैं" +msgstr "" +"<a href=\"%(url)s\">गूगल विश्लेषिकी</a> साईट पर प्राप्त करे,अगर आप गूगल विश्लेषिकी का " +"उपयोग करके अपनी साइट की निगरानी करना चाहते हैं" #: conf/external_keys.py:51 msgid "Enable recaptcha (keys below are required)" msgstr " reCAPTCHA (नीचे कुंजी की आवश्यकता है) सक्रिय करें" -#: conf/external_keys.py:60 +#: conf/external_keys.py:62 msgid "Recaptcha public key" msgstr "ReCAPTCHA सार्वजनिक कुंजी" -#: conf/external_keys.py:68 +#: conf/external_keys.py:70 msgid "Recaptcha private key" msgstr "ReCAPTCHA निजी कुंजी" -#: conf/external_keys.py:70 +#: conf/external_keys.py:72 #, python-format msgid "" "Recaptcha is a tool that helps distinguish real people from annoying spam " -"robots. Please get this and a public key at the <a " -"href=\"%(url)s\">%(url)s</a>" -msgstr "ReCAPTCHA एक उपकरण है कि कष्टप्रद स्पैम रोबोटों से वास्तविक लोगों में से भेद करने में मदद करता है.कृपया <a href=\"%(url)s\">%(url)s</a> पर एक सार्वजनिक कुंजी और इसे प्राप्त करे " +"robots. Please get this and a public key at the <a href=\"%(url)s\">%(url)s</" +"a>" +msgstr "" +"ReCAPTCHA एक उपकरण है कि कष्टप्रद स्पैम रोबोटों से वास्तविक लोगों में से भेद करने में मदद " +"करता है.कृपया <a href=\"%(url)s\">%(url)s</a> पर एक सार्वजनिक कुंजी और इसे प्राप्त " +"करे " -#: conf/external_keys.py:82 +#: conf/external_keys.py:84 msgid "Facebook public API key" msgstr "फेसबुक सार्वजनिक एपीआई कुंजी" -#: conf/external_keys.py:84 +#: conf/external_keys.py:86 #, python-format msgid "" "Facebook API key and Facebook secret allow to use Facebook Connect login " -"method at your site. Please obtain these keys at <a " -"href=\"%(url)s\">facebook create app</a> site" -msgstr " फेसबुक एपीआई कुंजी और गुप्त फेसबुक अपनी साइट पर फेसबुक कनेक्ट लॉगिन विधि का उपयोग करने के लिए अनुमति देते हैं. कृपया <a href=\"%(url)s\">facebook create app</a>साईट पर इन कुंजी को प्राप्त करें" +"method at your site. Please obtain these keys at <a href=\"%(url)s" +"\">facebook create app</a> site" +msgstr "" +" फेसबुक एपीआई कुंजी और गुप्त फेसबुक अपनी साइट पर फेसबुक कनेक्ट लॉगिन विधि का उपयोग करने के " +"लिए अनुमति देते हैं. कृपया <a href=\"%(url)s\">facebook create app</a>साईट पर इन " +"कुंजी को प्राप्त करें" -#: conf/external_keys.py:97 +#: conf/external_keys.py:99 msgid "Facebook secret key" msgstr "फेसबुक गुप्त कुंजी" -#: conf/external_keys.py:105 +#: conf/external_keys.py:107 msgid "Twitter consumer key" msgstr "ट्विटर उपभोक्ता कुंजी" -#: conf/external_keys.py:107 +#: conf/external_keys.py:109 #, python-format msgid "" -"Please register your forum at <a href=\"%(url)s\">twitter applications " -"site</a>" -msgstr "कृपया <a href=\"%(url)s\">twitter applications site</a> पर अपने फोरम का पंजीकरण करे " +"Please register your forum at <a href=\"%(url)s\">twitter applications site</" +"a>" +msgstr "" +"कृपया <a href=\"%(url)s\">twitter applications site</a> पर अपने फोरम का " +"पंजीकरण करे " -#: conf/external_keys.py:118 +#: conf/external_keys.py:120 msgid "Twitter consumer secret" msgstr "ट्विटर उपभोक्ता रहस्य" -#: conf/external_keys.py:126 +#: conf/external_keys.py:128 msgid "LinkedIn consumer key" msgstr "LinkedIn उपभोक्ता कुंजी" -#: conf/external_keys.py:128 +#: conf/external_keys.py:130 #, python-format msgid "" -"Please register your forum at <a href=\"%(url)s\">LinkedIn developer " -"site</a>" -msgstr "कृपया <a href=\"%(url)s\">LinkedIn developer site</a> पर अपने फोरम का पंजीकरण करे " +"Please register your forum at <a href=\"%(url)s\">LinkedIn developer site</a>" +msgstr "" +"कृपया <a href=\"%(url)s\">LinkedIn developer site</a> पर अपने फोरम का पंजीकरण " +"करे " -#: conf/external_keys.py:139 +#: conf/external_keys.py:141 msgid "LinkedIn consumer secret" msgstr "LinkedIn उपभोक्ता रहस्य" -#: conf/external_keys.py:147 +#: conf/external_keys.py:149 msgid "ident.ca consumer key" msgstr "ident.ca उपभोक्ता कुंजी" -#: conf/external_keys.py:149 +#: conf/external_keys.py:151 #, python-format msgid "" "Please register your forum at <a href=\"%(url)s\">Identi.ca applications " "site</a>" -msgstr "<a href=\"%(url)s\">Identi.ca applications site</a>पर अपने फोरम का पंजीकरण करे " +msgstr "" +"<a href=\"%(url)s\">Identi.ca applications site</a>पर अपने फोरम का पंजीकरण करे " -#: conf/external_keys.py:160 +#: conf/external_keys.py:162 msgid "ident.ca consumer secret" msgstr "ident.ca उपभोक्ता रहस्य" -#: conf/external_keys.py:168 -msgid "Use LDAP authentication for the password login" -msgstr "कूटशब्द लॉगिन के लिए LDAP सत्यापन का उपयोग करें" - -#: conf/external_keys.py:177 -msgid "LDAP service provider name" -msgstr "LDAP सेवा प्रदाता नाम" - -#: conf/external_keys.py:185 -msgid "URL for the LDAP service" -msgstr "LDAP सेवा के लिए यूआरएल" - -#: conf/external_keys.py:193 -msgid "Explain how to change LDAP password" -msgstr "व्याख्या कीजिये LDAP कूटशब्द को परिवर्तित कैसे करे " - #: conf/flatpages.py:11 msgid "Flatpages - about, privacy policy, etc." msgstr "flatpages -बारे में, गोपनीयता नीति, आदि." @@ -839,7 +877,9 @@ msgstr "Q&A फोरम के बारे में पृष्ठ (HTML स msgid "" "Save, then <a href=\"http://validator.w3.org/\">use HTML validator</a> on " "the \"about\" page to check your input." -msgstr "सहेजे, \"बारे में\" पृष्ठ पर अपने इनपुट की जाँच करने के लिए<a href=\"http://validator.w3.org/\">HTML Validator का प्रयोग</a > करे ." +msgstr "" +"सहेजे, \"बारे में\" पृष्ठ पर अपने इनपुट की जाँच करने के लिए<a href=\"http://validator.w3." +"org/\">HTML Validator का प्रयोग</a > करे ." #: conf/flatpages.py:32 msgid "Text of the Q&A forum FAQ page (html format)" @@ -849,7 +889,9 @@ msgstr "Q&A फोरम FAQ पृष्ट (HTML स्वरूप) का msgid "" "Save, then <a href=\"http://validator.w3.org/\">use HTML validator</a> on " "the \"faq\" page to check your input." -msgstr "सहेजे, \"faq\" पृष्ठ पर अपने इनपुट की जाँच करने के लिए<a href=\"http://validator.w3.org/\">HTML Validator का प्रयोग</a > करे ." +msgstr "" +"सहेजे, \"faq\" पृष्ठ पर अपने इनपुट की जाँच करने के लिए<a href=\"http://validator.w3." +"org/\">HTML Validator का प्रयोग</a > करे ." #: conf/flatpages.py:46 msgid "Text of the Q&A forum Privacy Policy (html format)" @@ -859,7 +901,9 @@ msgstr "Q&A फोरम गोपनीयता नीति (HTML स्व msgid "" "Save, then <a href=\"http://validator.w3.org/\">use HTML validator</a> on " "the \"privacy\" page to check your input." -msgstr "सहेजे, \"गोपनीयता\" पृष्ठ पर अपने इनपुट की जाँच करने के लिए<a href=\"http://validator.w3.org/\">HTML Validator का प्रयोग</a > करे ." +msgstr "" +"सहेजे, \"गोपनीयता\" पृष्ठ पर अपने इनपुट की जाँच करने के लिए<a href=\"http://validator." +"w3.org/\">HTML Validator का प्रयोग</a > करे ." #: conf/forum_data_rules.py:12 msgid "Data entry and display rules" @@ -868,9 +912,11 @@ msgstr "" #: conf/forum_data_rules.py:22 #, python-format msgid "" -"Enable embedding videos. <em>Note: please read <a href=\"%(url)s>read " -"this</a> first.</em>" -msgstr " एम्बेड वीडियो को सक्रिय करें.नोट: कृपया पढ़ें <a href=\"%(url)s> इस </ a> के पहले</ em> पढ़ें." +"Enable embedding videos. <em>Note: please read <a href=\"%(url)s>read this</" +"a> first.</em>" +msgstr "" +" एम्बेड वीडियो को सक्रिय करें.नोट: कृपया पढ़ें <a href=\"%(url)s> इस </ a> के पहले</ " +"em> पढ़ें." #: conf/forum_data_rules.py:33 msgid "Check to enable community wiki feature" @@ -882,9 +928,11 @@ msgstr "गुमनाम प्रश्नों को पूछने क #: conf/forum_data_rules.py:44 msgid "" -"Users do not accrue reputation for anonymous questions and their identity is" -" not revealed until they change their mind" -msgstr "उपयोगकर्ता अज्ञात प्रश्नों के लिए प्रतिष्ठा देय नहीं होंगे और उनकी पहचान नहीं प्रगट होता है और उनकी पहचान नहीं प्रगट होता है जब तक वे अपने मन बदलते हैं" +"Users do not accrue reputation for anonymous questions and their identity is " +"not revealed until they change their mind" +msgstr "" +"उपयोगकर्ता अज्ञात प्रश्नों के लिए प्रतिष्ठा देय नहीं होंगे और उनकी पहचान नहीं प्रगट होता है " +"और उनकी पहचान नहीं प्रगट होता है जब तक वे अपने मन बदलते हैं" #: conf/forum_data_rules.py:56 msgid "Allow posting before logging in" @@ -896,7 +944,11 @@ msgid "" "logging in. Enabling this may require adjustments in the user login system " "to check for pending posts every time the user logs in. The builtin Askbot " "login system supports this feature." -msgstr "जाँच करें यदि आप उपयोगकर्ताओं को अंदर प्रवेश करने से पहले प्रश्नों के या जवाब पोस्टिंग शुरू करने की अनुमति चाहते हैं.इसे सक्षम करने से उपयोगकर्ता लॉगिन प्रणाली में समायोजन लंबित पदों के लिए हर समय उपयोगकर्ता में लॉग की जाँच करने की आवश्यकता हो सकती है.Builtin Askbot लॉगिन प्रणाली इस सुविधा का समर्थन करता है." +msgstr "" +"जाँच करें यदि आप उपयोगकर्ताओं को अंदर प्रवेश करने से पहले प्रश्नों के या जवाब पोस्टिंग शुरू करने " +"की अनुमति चाहते हैं.इसे सक्षम करने से उपयोगकर्ता लॉगिन प्रणाली में समायोजन लंबित पदों के " +"लिए हर समय उपयोगकर्ता में लॉग की जाँच करने की आवश्यकता हो सकती है.Builtin Askbot " +"लॉगिन प्रणाली इस सुविधा का समर्थन करता है." #: conf/forum_data_rules.py:73 msgid "Allow swapping answer with question" @@ -906,7 +958,9 @@ msgstr "सवाल के साथ जवाब के स्वैपिं msgid "" "This setting will help import data from other forums such as zendesk, when " "automatic data import fails to detect the original question correctly." -msgstr "यह सेटिंग zendesk जैसे अन्य फोरम से डेटा को आयात करने में मदद मिलेगी,जब स्वत: डेटा आयात करने के लिए मौलिक सवाल का सही ढंग से पता लगाने में विफल रहता है." +msgstr "" +"यह सेटिंग zendesk जैसे अन्य फोरम से डेटा को आयात करने में मदद मिलेगी,जब स्वत: डेटा आयात " +"करने के लिए मौलिक सवाल का सही ढंग से पता लगाने में विफल रहता है." #: conf/forum_data_rules.py:87 msgid "Maximum length of tag (number of characters)" @@ -932,7 +986,9 @@ msgstr "अनिवार्य टैग" msgid "" "At least one of these tags will be required for any new or newly edited " "question. A mandatory tag may be wildcard, if the wildcard tags are active." -msgstr "कम से कम इन टैग का कोई नया या नए संपादित सवाल के लिए आवश्यक हो सकती है .अनिवार्य टैग वाइल्डकार्ड का हो सकता है , अगर वाइल्डकार्ड टैग सक्रिय है." +msgstr "" +"कम से कम इन टैग का कोई नया या नए संपादित सवाल के लिए आवश्यक हो सकती है .अनिवार्य टैग " +"वाइल्डकार्ड का हो सकता है , अगर वाइल्डकार्ड टैग सक्रिय है." #: conf/forum_data_rules.py:141 msgid "Force lowercase the tags" @@ -943,7 +999,9 @@ msgid "" "Attention: after checking this, please back up the database, and run a " "management command: <code>python manage.py fix_question_tags</code> to " "globally rename the tags" -msgstr "ध्यान दें: इस जाँच के बाद, कृपया डेटाबेस के बैकअप करे , और एक प्रबंधन कमांड चलाएँ: <code>python manage.py fix_question_tags</code> टैग को ग्लोबली पुनःनामकरण करे " +msgstr "" +"ध्यान दें: इस जाँच के बाद, कृपया डेटाबेस के बैकअप करे , और एक प्रबंधन कमांड चलाएँ: " +"<code>python manage.py fix_question_tags</code> टैग को ग्लोबली पुनःनामकरण करे " #: conf/forum_data_rules.py:157 msgid "Format of tag list" @@ -951,9 +1009,9 @@ msgstr "टैग सूची का प्रारूप" #: conf/forum_data_rules.py:159 msgid "" -"Select the format to show tags in, either as a simple list, or as a tag " -"cloud" -msgstr "प्रारूप का चयन या तो एक साधारण सूची के रूप या एक टैग क्लौड में, करके टैग को दिखाएं" +"Select the format to show tags in, either as a simple list, or as a tag cloud" +msgstr "" +"प्रारूप का चयन या तो एक साधारण सूची के रूप या एक टैग क्लौड में, करके टैग को दिखाएं" #: conf/forum_data_rules.py:171 msgid "Use wildcard tags" @@ -963,7 +1021,9 @@ msgstr "वाइल्डकार्ड टैग का प्रयोग msgid "" "Wildcard tags can be used to follow or ignore many tags at once, a valid " "wildcard tag has a single wildcard at the very end" -msgstr "वाइल्डकार्ड टैग का इस्तेमाल अनुसरण करने या कई टैग की अनदेखी करने के लिए किया जा सकता है,वैध वाइल्डकार्ड टैग के सबसे अंत में एकल वाइल्डकार्ड होता है." +msgstr "" +"वाइल्डकार्ड टैग का इस्तेमाल अनुसरण करने या कई टैग की अनदेखी करने के लिए किया जा सकता है," +"वैध वाइल्डकार्ड टैग के सबसे अंत में एकल वाइल्डकार्ड होता है." #: conf/forum_data_rules.py:186 msgid "Default max number of comments to display under posts" @@ -1011,7 +1071,10 @@ msgid "" "Check to disable the \"sticky\" behavior of the search query. This may be " "useful if you want to move the search bar away from the default position or " "do not like the default sticky behavior of the text search query." -msgstr "सर्च क्वेरी के \"स्तिच्क्य \" व्यवहार को निष्क्रिय करने के लिए जाँच करें.यह उपयोगी हो सकता है.अगर आप सर्च बार को डिफ़ॉल्ट स्थिति से दूर ले जाएँ या टेक्स्ट खोज क्वेरी के डिफ़ॉल्ट स्टिकी व्यवहार को पसंद नहीं करना चाहते हो." +msgstr "" +"सर्च क्वेरी के \"स्तिच्क्य \" व्यवहार को निष्क्रिय करने के लिए जाँच करें.यह उपयोगी हो सकता " +"है.अगर आप सर्च बार को डिफ़ॉल्ट स्थिति से दूर ले जाएँ या टेक्स्ट खोज क्वेरी के डिफ़ॉल्ट स्टिकी " +"व्यवहार को पसंद नहीं करना चाहते हो." #: conf/forum_data_rules.py:264 msgid "Maximum number of tags per question" @@ -1025,6 +1088,40 @@ msgstr " तयशुदा रूप से प्रश्नों के स msgid "What should \"unanswered question\" mean?" msgstr "\"अनुत्तरित प्रश्न\" का क्या मतलब होना चाहिए?" +#: conf/ldap.py:9 +msgid "LDAP login configuration" +msgstr "" + +#: conf/ldap.py:17 +msgid "Use LDAP authentication for the password login" +msgstr "कूटशब्द लॉगिन के लिए LDAP सत्यापन का उपयोग करें" + +#: conf/ldap.py:26 +msgid "LDAP URL" +msgstr "" + +#: conf/ldap.py:35 +msgid "LDAP BASE DN" +msgstr "" + +#: conf/ldap.py:43 +msgid "LDAP Search Scope" +msgstr "" + +#: conf/ldap.py:52 +#, fuzzy +msgid "LDAP Server USERID field name" +msgstr "LDAP सेवा प्रदाता नाम" + +#: conf/ldap.py:61 +msgid "LDAP Server \"Common Name\" field name" +msgstr "" + +#: conf/ldap.py:70 +#, fuzzy +msgid "LDAP Server EMAIL field name" +msgstr "LDAP सेवा प्रदाता नाम" + #: conf/leading_sidebar.py:12 msgid "Common left sidebar" msgstr "" @@ -1089,7 +1186,8 @@ msgid "Login provider setings" msgstr "लॉगइन प्रदाता सेटिंग्स" #: conf/login_providers.py:22 -msgid "Show alternative login provider buttons on the password \"Sign Up\" page" +msgid "" +"Show alternative login provider buttons on the password \"Sign Up\" page" msgstr "कूटशब्द \"साइन अप\" पृष्ठ पर वैकल्पिक लॉगिन प्रदाता बटन को दर्शाए " #: conf/login_providers.py:31 @@ -1104,19 +1202,24 @@ msgstr "स्वयं द्वारा होस्ट किए WordPress msgid "" "to activate this feature you must fill out the wordpress xml-rpc setting " "bellow" -msgstr "इस सुविधा को सक्रिय करने के लिए आपको WordPress XML-RPC bellow सेटिंग में भरना होगा" +msgstr "" +"इस सुविधा को सक्रिय करने के लिए आपको WordPress XML-RPC bellow सेटिंग में भरना होगा" #: conf/login_providers.py:50 msgid "" -"Fill it with the wordpress url to the xml-rpc, normally " -"http://mysite.com/xmlrpc.php" -msgstr " WordPress यूआरएल के साथ XML-RPC के लिए, http://mysite.com/xmlrpc.php पर सामान्य रूप से भरे " +"Fill it with the wordpress url to the xml-rpc, normally http://mysite.com/" +"xmlrpc.php" +msgstr "" +" WordPress यूआरएल के साथ XML-RPC के लिए, http://mysite.com/xmlrpc.php पर " +"सामान्य रूप से भरे " #: conf/login_providers.py:51 msgid "" "To enable, go to Settings->Writing->Remote Publishing and check the box for " "XML-RPC" -msgstr "सक्षम करने के लिए, Settings->Writing->Remote Publishing पर जाये और XML-RPC के लिए चेक बॉक्स" +msgstr "" +"सक्षम करने के लिए, Settings->Writing->Remote Publishing पर जाये और XML-RPC के लिए " +"चेक बॉक्स" #: conf/login_providers.py:60 msgid "Upload your icon" @@ -1132,7 +1235,9 @@ msgstr "%(provider)s लॉगिन सक्रिय करें" msgid "" "Note: to really enable %(provider)s login some additional parameters will " "need to be set in the \"External keys\" section" -msgstr "नोट: वास्तव में %(provider)s लॉगिन को सक्षम करने के लिए कुछ अतिरिक्त पैरामीटर \"विदेश कुंजी\" खंड में सेट करने की आवश्यकता होगी" +msgstr "" +"नोट: वास्तव में %(provider)s लॉगिन को सक्षम करने के लिए कुछ अतिरिक्त पैरामीटर \"विदेश " +"कुंजी\" खंड में सेट करने की आवश्यकता होगी" #: conf/markup.py:15 msgid "Markup in posts" @@ -1144,11 +1249,15 @@ msgstr "कोड के अनुकूल markdown सक्रिय कर #: conf/markup.py:43 msgid "" -"If checked, underscore characters will not trigger italic or bold formatting" -" - bold and italic text can still be marked up with asterisks. Note that " +"If checked, underscore characters will not trigger italic or bold formatting " +"- bold and italic text can still be marked up with asterisks. Note that " "\"MathJax support\" implicitly turns this feature on, because underscores " "are heavily used in LaTeX input." -msgstr "अगर जाँच की जाये, अंडरस्कोर वर्ण इटैलिक या बोल्ड स्वरूपण को ट्रिगर नहीं करेगा-बोल्ड और इटैलिक टेक्स्ट अभी भी एस्टेरिस्क से चिह्नित किया जा सकता है.ध्यान दें कि \"MathJax support\" संकेत पर इस सुविधा को बदल देता है, क्योंकि लेटेक्स इनपुट के रूप अंडरस्कोर का ज्यादा इस्तेमाल होता है ." +msgstr "" +"अगर जाँच की जाये, अंडरस्कोर वर्ण इटैलिक या बोल्ड स्वरूपण को ट्रिगर नहीं करेगा-बोल्ड और " +"इटैलिक टेक्स्ट अभी भी एस्टेरिस्क से चिह्नित किया जा सकता है.ध्यान दें कि \"MathJax support" +"\" संकेत पर इस सुविधा को बदल देता है, क्योंकि लेटेक्स इनपुट के रूप अंडरस्कोर का ज्यादा " +"इस्तेमाल होता है ." #: conf/markup.py:58 msgid "Mathjax support (rendering of LaTeX)" @@ -1159,7 +1268,9 @@ msgstr "Mathjax समर्थन (लेटेक्स का प्रति msgid "" "If you enable this feature, <a href=\"%(url)s\">mathjax</a> must be " "installed on your server in its own directory." -msgstr "यदि आपको इस विशेषता को सक्षम करना चाहते है ,<a href=\"%(url)s\"> mathjax </ a> अपनी निर्देशिका में आपके सर्वर पर स्थापित होना आवश्यक है." +msgstr "" +"यदि आपको इस विशेषता को सक्षम करना चाहते है ,<a href=\"%(url)s\"> mathjax </ a> " +"अपनी निर्देशिका में आपके सर्वर पर स्थापित होना आवश्यक है." #: conf/markup.py:74 msgid "Base url of MathJax deployment" @@ -1170,7 +1281,10 @@ msgid "" "Note - <strong>MathJax is not included with askbot</strong> - you should " "deploy it yourself, preferably at a separate domain and enter url pointing " "to the \"mathjax\" directory (for example: http://mysite.com/mathjax)" -msgstr "नोट - <strong> MathJax askbot के साथ शामिल नहीं है </ strong> आप इसे अपने आप को अधिमानतः एक अलग डोमेन पर और यूआरएल \"mathjax\" निर्देशिका (उदाहरण के लिए: http://mysite.com/mathjax) की ओर इशारा करते हुए दर्ज करके परिनियोजित करनी चाहिए," +msgstr "" +"नोट - <strong> MathJax askbot के साथ शामिल नहीं है </ strong> आप इसे अपने आप को " +"अधिमानतः एक अलग डोमेन पर और यूआरएल \"mathjax\" निर्देशिका (उदाहरण के लिए: http://" +"mysite.com/mathjax) की ओर इशारा करते हुए दर्ज करके परिनियोजित करनी चाहिए," #: conf/markup.py:91 msgid "Enable autolinking with specific patterns" @@ -1178,9 +1292,11 @@ msgstr "विशिष्ट नमूनों के लिए औतोल #: conf/markup.py:93 msgid "" -"If you enable this feature, the application will be able to detect patterns" -" and auto link to URLs" -msgstr "यदि आप इस फ़ीचर को सक्रिय करते है ,अनुप्रयोग यूआरएल के लिए पैटर्न और स्वत लिंक का पता लगाने में सक्षम हो जाएगा" +"If you enable this feature, the application will be able to detect patterns " +"and auto link to URLs" +msgstr "" +"यदि आप इस फ़ीचर को सक्रिय करते है ,अनुप्रयोग यूआरएल के लिए पैटर्न और स्वत लिंक का पता " +"लगाने में सक्षम हो जाएगा" #: conf/markup.py:106 msgid "Regexes to detect the link patterns" @@ -1193,7 +1309,11 @@ msgid "" "The numbers captured by the pattern in the parentheses will be transferred " "to the link url template. Please look up more information about regular " "expressions elsewhere." -msgstr "क पैटर्न प्रति पंक्ति के लिए मान्य नियमित अभिव्यक्ति दर्ज करें.उदाहरण के लिए एक बग पैटर्न का पता लगाने के लिए, # bug123 के समान,निम्नलिखित regex: #bug(\\d+) का उपयोग करे, कोष्ठकों में पैटर्न द्वारा कब्जा किये गए संख्या को लिंक यूआरएल टेम्पलेट में हस्तांतरित किया जाएगा.कृपया नियमित अभिव्यक्ति के बारे में अधिक जानकारी के लिए कहीं और देखो." +msgstr "" +"क पैटर्न प्रति पंक्ति के लिए मान्य नियमित अभिव्यक्ति दर्ज करें.उदाहरण के लिए एक बग पैटर्न " +"का पता लगाने के लिए, # bug123 के समान,निम्नलिखित regex: #bug(\\d+) का उपयोग करे, " +"कोष्ठकों में पैटर्न द्वारा कब्जा किये गए संख्या को लिंक यूआरएल टेम्पलेट में हस्तांतरित किया " +"जाएगा.कृपया नियमित अभिव्यक्ति के बारे में अधिक जानकारी के लिए कहीं और देखो." #: conf/markup.py:127 msgid "URLs for autolinking" @@ -1203,11 +1323,16 @@ msgstr "Autolinking के लिए यूआरएल" msgid "" "Here, please enter url templates for the patterns entered in the previous " "setting, also one entry per line. <strong>Make sure that number of lines in " -"this setting and the previous one are the same</strong> For example template" -" https://bugzilla.redhat.com/show_bug.cgi?id=\\1 together with the pattern " +"this setting and the previous one are the same</strong> For example template " +"https://bugzilla.redhat.com/show_bug.cgi?id=\\1 together with the pattern " "shown above and the entry in the post #123 will produce link to the bug 123 " "in the redhat bug tracker." -msgstr "कृपया यहाँ पिछले सेटिंग में दर्ज किया पैटर्न के अनुसार पंक्ति एक प्रविष्टि का यूआरएल टेम्पलेट्स दर्ज करें,<strong>सुनिश्चित करें कि इस सेटिंग और पिछले एक में लाइनों की संख्या एक ही हैं</strong >उदाहरण के लिएऊपर दिखाए गए पैटर्न टेम्पलेट https://bugzilla.redhat.com/show_bug.cgi?id=\\1 के साथ और पोस्ट 123 में प्रवेश redhat बग ट्रैकर में बग 123 के लिए लिंक का उत्पादन होगा." +msgstr "" +"कृपया यहाँ पिछले सेटिंग में दर्ज किया पैटर्न के अनुसार पंक्ति एक प्रविष्टि का यूआरएल टेम्पलेट्स " +"दर्ज करें,<strong>सुनिश्चित करें कि इस सेटिंग और पिछले एक में लाइनों की संख्या एक ही हैं</" +"strong >उदाहरण के लिएऊपर दिखाए गए पैटर्न टेम्पलेट https://bugzilla.redhat.com/" +"show_bug.cgi?id=\\1 के साथ और पोस्ट 123 में प्रवेश redhat बग ट्रैकर में बग 123 के लिए " +"लिंक का उत्पादन होगा." #: conf/minimum_reputation.py:12 msgid "Karma thresholds" @@ -1289,7 +1414,9 @@ msgstr "खुद के होमपेज से rel=nofollow हटाये msgid "" "When a search engine crawler will see a rel=nofollow attribute on a link - " "the link will not count towards the rank of the users personal site." -msgstr "जब एक खोज इंजन क्रॉलर एक लिंक पर एक rel = nofollow गुण देखेंगे - लिंक उपयोगकर्ताओं को व्यक्तिगत साइट की रैंक की ओर गिनती नहीं होगी." +msgstr "" +"जब एक खोज इंजन क्रॉलर एक लिंक पर एक rel = nofollow गुण देखेंगे - लिंक उपयोगकर्ताओं को " +"व्यक्तिगत साइट की रैंक की ओर गिनती नहीं होगी." #: conf/reputation_changes.py:13 msgid "Karma loss and gain rules" @@ -1341,11 +1468,13 @@ msgstr "पोस्ट के स्वामी को घाटा विप #: conf/reputation_changes.py:128 msgid "Loss for owner of post that was flagged 3 times per same revision" -msgstr "पोस्ट के मालिक के लिए नुकसान को एक ही संशोधन के अनुसार 3 बार ध्वजांकित किया गया था" +msgstr "" +"पोस्ट के मालिक के लिए नुकसान को एक ही संशोधन के अनुसार 3 बार ध्वजांकित किया गया था" #: conf/reputation_changes.py:138 msgid "Loss for owner of post that was flagged 5 times per same revision" -msgstr "पोस्ट के मालिक के लिए नुकसान को एक ही संशोधन के अनुसार 5 बार ध्वजांकित किया गया था" +msgstr "" +"पोस्ट के मालिक के लिए नुकसान को एक ही संशोधन के अनुसार 5 बार ध्वजांकित किया गया था" #: conf/reputation_changes.py:148 msgid "Loss for post owner when upvote is canceled" @@ -1367,7 +1496,11 @@ msgid "" "When using this option (as well as the sidebar footer), please use the HTML " "validation service to make sure that your input is valid and works well in " "all browsers." -msgstr "इस क्षेत्र का उपयोग sidebarin HTML स्वरूप के शीर्ष पर कंटेंट दर्ज करने के लिए करें, जब इस विकल्प का उपयोग (साइडबार पादलेख के रूप में) करते है , HTML सत्यापन सेवा का उपयोग करने के लिए सुनिश्चित करें कि कृपया आपके इनपुट मान्य है और अच्छी तरह से सभी ब्राउज़रों में काम करता है." +msgstr "" +"इस क्षेत्र का उपयोग sidebarin HTML स्वरूप के शीर्ष पर कंटेंट दर्ज करने के लिए करें, जब " +"इस विकल्प का उपयोग (साइडबार पादलेख के रूप में) करते है , HTML सत्यापन सेवा का उपयोग " +"करने के लिए सुनिश्चित करें कि कृपया आपके इनपुट मान्य है और अच्छी तरह से सभी ब्राउज़रों में " +"काम करता है." #: conf/sidebar_main.py:36 msgid "Show avatar block in sidebar" @@ -1389,7 +1522,8 @@ msgstr "साइडबार में टैग चयनकर्ता द msgid "" "Uncheck this if you want to hide the options for choosing interesting and " "ignored tags " -msgstr "अचयनित करे यदि आप इस रोचक और नजरअंदाज टैग के चयन के लिए विकल्पों को छिपाना चाहते हैं " +msgstr "" +"अचयनित करे यदि आप इस रोचक और नजरअंदाज टैग के चयन के लिए विकल्पों को छिपाना चाहते हैं " #: conf/sidebar_main.py:72 msgid "Show tag list/cloud in sidebar" @@ -1408,10 +1542,10 @@ msgstr "कस्टम साइडबार पादलेख" #: conf/sidebar_main.py:88 conf/sidebar_profile.py:39 #: conf/sidebar_question.py:78 msgid "" -"Use this area to enter content at the BOTTOM of the sidebarin HTML format." -" When using this option (as well as the sidebar header), please use the " -"HTML validation service to make sure that your input is valid and works well" -" in all browsers." +"Use this area to enter content at the BOTTOM of the sidebarin HTML format. " +"When using this option (as well as the sidebar header), please use the HTML " +"validation service to make sure that your input is valid and works well in " +"all browsers." msgstr "" #: conf/sidebar_profile.py:12 @@ -1488,27 +1622,27 @@ msgstr "" msgid "Short name for your Q&A forum" msgstr "" -#: conf/site_settings.py:68 +#: conf/site_settings.py:67 msgid "Base URL for your Q&A forum, must start with http or https" msgstr "" -#: conf/site_settings.py:79 +#: conf/site_settings.py:78 msgid "Check to enable greeting for anonymous user" msgstr "" -#: conf/site_settings.py:90 +#: conf/site_settings.py:89 msgid "Text shown in the greeting message shown to the anonymous user" msgstr "" -#: conf/site_settings.py:94 +#: conf/site_settings.py:93 msgid "Use HTML to format the message " msgstr "" -#: conf/site_settings.py:103 +#: conf/site_settings.py:102 msgid "Feedback site URL" msgstr "" -#: conf/site_settings.py:105 +#: conf/site_settings.py:104 msgid "If left empty, a simple internal feedback form will be used instead" msgstr "" @@ -1650,8 +1784,8 @@ msgstr "साइट favicon" #: conf/skin_general_settings.py:53 #, python-format msgid "" -"A small 16x16 or 32x32 pixel icon image used to distinguish your site in the" -" browser user interface. Please find more information about favicon at <a " +"A small 16x16 or 32x32 pixel icon image used to distinguish your site in the " +"browser user interface. Please find more information about favicon at <a " "href=\"%(favicon_info_url)s\">this page</a>." msgstr "" @@ -1661,8 +1795,8 @@ msgstr "" #: conf/skin_general_settings.py:71 msgid "" -"An 88x38 pixel image that is used on the login screen for the password login" -" button." +"An 88x38 pixel image that is used on the login screen for the password login " +"button." msgstr "" #: conf/skin_general_settings.py:84 @@ -1672,8 +1806,8 @@ msgstr "" #: conf/skin_general_settings.py:86 msgid "" "If checked, all forum functions will be shown to users, regardless of their " -"reputation. However to use those functions, moderation rules, reputation and" -" other limits will still apply." +"reputation. However to use those functions, moderation rules, reputation and " +"other limits will still apply." msgstr "" #: conf/skin_general_settings.py:101 @@ -1692,12 +1826,12 @@ msgstr "" msgid "" "<strong>To use this option</strong>, check \"Customize HTML <HEAD>\" " "above. Contents of this box will be inserted into the <HEAD> portion " -"of the HTML output, where elements such as <script>, <link>, " -"<meta> may be added. Please, keep in mind that adding external " -"javascript to the <HEAD> is not recommended because it slows loading " -"of the pages. Instead, it will be more efficient to place links to the " -"javascript files into the footer. <strong>Note:</strong> if you do use this " -"setting, please test the site with the W3C HTML validator service." +"of the HTML output, where elements such as <script>, <link>, <" +"meta> may be added. Please, keep in mind that adding external javascript " +"to the <HEAD> is not recommended because it slows loading of the " +"pages. Instead, it will be more efficient to place links to the javascript " +"files into the footer. <strong>Note:</strong> if you do use this setting, " +"please test the site with the W3C HTML validator service." msgstr "" #: conf/skin_general_settings.py:145 @@ -1706,8 +1840,8 @@ msgstr "" #: conf/skin_general_settings.py:147 msgid "" -"Header is the bar at the top of the content that contains user info and site" -" links, and is common to all pages. Use this area to enter contents of the " +"Header is the bar at the top of the content that contains user info and site " +"links, and is common to all pages. Use this area to enter contents of the " "headerin the HTML format. When customizing the site header (as well as " "footer and the HTML <HEAD>), use the HTML validation service to make " "sure that your input is valid and works well in all browsers." @@ -1754,9 +1888,9 @@ msgstr "" msgid "" "<strong>To use this function</strong>, check \"Apply custom style sheet\" " "option above. The CSS rules added in this window will be applied after the " -"default style sheet rules. The custom style sheet will be served dynamically" -" at url \"<forum url>/custom.css\", where the \"<forum url> part" -" depends (default is empty string) on the url configuration in your urls.py." +"default style sheet rules. The custom style sheet will be served dynamically " +"at url \"<forum url>/custom.css\", where the \"<forum url> part " +"depends (default is empty string) on the url configuration in your urls.py." msgstr "" #: conf/skin_general_settings.py:230 @@ -1773,13 +1907,13 @@ msgstr "" #: conf/skin_general_settings.py:245 msgid "" -"Type or paste plain javascript that you would like to run on your site. Link" -" to the script will be inserted at the bottom of the HTML output and will be" -" served at the url \"<forum url>/custom.js\". Please, bear in mind " -"that your javascript code may break other functionalities of the site and " -"that the behavior may not be consistent across different browsers " -"(<strong>to enable your custom code</strong>, check \"Add custom " -"javascript\" option above)." +"Type or paste plain javascript that you would like to run on your site. Link " +"to the script will be inserted at the bottom of the HTML output and will be " +"served at the url \"<forum url>/custom.js\". Please, bear in mind that " +"your javascript code may break other functionalities of the site and that " +"the behavior may not be consistent across different browsers (<strong>to " +"enable your custom code</strong>, check \"Add custom javascript\" option " +"above)." msgstr "" #: conf/skin_general_settings.py:263 @@ -1900,10 +2034,10 @@ msgstr "" #, python-format msgid "" "Check this option if you want to allow the use of gravatar.com for avatars. " -"Please, note that this feature might take about 10 minutes to become 100% " -"effective. You will have to enable uploaded avatars as well. For more " -"information, please visit <a href=\"http://askbot.org/doc/optional-" -"modules.html#uploaded-avatars\">this page</a>." +"Please, note that this feature might take about 10 minutes to become " +"100% effective. You will have to enable uploaded avatars as well. For more " +"information, please visit <a href=\"http://askbot.org/doc/optional-modules." +"html#uploaded-avatars\">this page</a>." msgstr "" #: conf/user_settings.py:97 @@ -1970,10 +2104,10 @@ msgstr "" #: conf/widgets.py:28 msgid "" "To embed the widget, add the following code to your site (and fill in " -"correct base url, preferred tags, width and height):<iframe " -"src=\"{{base_url}}/widgets/questions?tags={{comma-separated-tags}}\" " -"width=\"100%\" height=\"300\"scrolling=\"no\"><p>Your browser does not " -"support iframes.</p></iframe>" +"correct base url, preferred tags, width and height):<iframe src=" +"\"{{base_url}}/widgets/questions?tags={{comma-separated-tags}}\" width=\"100%" +"\" height=\"300\"scrolling=\"no\"><p>Your browser does not support iframes.</" +"p></iframe>" msgstr "" #: conf/widgets.py:73 @@ -2024,321 +2158,334 @@ msgstr "" msgid "too localized" msgstr "" -#: const/__init__.py:41 +#: const/__init__.py:43 +#: skins/default/templates/question/answer_tab_bar.html:18 msgid "newest" msgstr "" -#: const/__init__.py:42 skins/default/templates/users.html:27 +#: const/__init__.py:44 skins/default/templates/users.html:27 +#: skins/default/templates/question/answer_tab_bar.html:15 msgid "oldest" msgstr "" -#: const/__init__.py:43 +#: const/__init__.py:45 msgid "active" msgstr "" -#: const/__init__.py:44 +#: const/__init__.py:46 msgid "inactive" msgstr "" -#: const/__init__.py:45 +#: const/__init__.py:47 msgid "hottest" msgstr "" -#: const/__init__.py:46 +#: const/__init__.py:48 msgid "coldest" msgstr "" -#: const/__init__.py:47 +#: const/__init__.py:49 +#: skins/default/templates/question/answer_tab_bar.html:21 msgid "most voted" msgstr "" -#: const/__init__.py:48 +#: const/__init__.py:50 msgid "least voted" msgstr "" -#: const/__init__.py:49 +#: const/__init__.py:51 const/message_keys.py:23 msgid "relevance" msgstr "" -#: const/__init__.py:57 +#: const/__init__.py:63 #: skins/default/templates/user_profile/user_inbox.html:50 #: skins/default/templates/user_profile/user_inbox.html:62 msgid "all" msgstr "" -#: const/__init__.py:58 +#: const/__init__.py:64 msgid "unanswered" msgstr "" -#: const/__init__.py:59 +#: const/__init__.py:65 msgid "favorite" msgstr "" -#: const/__init__.py:64 +#: const/__init__.py:70 msgid "list" msgstr "" -#: const/__init__.py:65 +#: const/__init__.py:71 msgid "cloud" msgstr "" -#: const/__init__.py:73 +#: const/__init__.py:79 msgid "Question has no answers" msgstr "" -#: const/__init__.py:74 +#: const/__init__.py:80 msgid "Question has no accepted answers" msgstr "" -#: const/__init__.py:119 +#: const/__init__.py:125 msgid "asked a question" msgstr "" -#: const/__init__.py:120 +#: const/__init__.py:126 msgid "answered a question" msgstr "" -#: const/__init__.py:121 +#: const/__init__.py:127 const/__init__.py:203 msgid "commented question" msgstr "" -#: const/__init__.py:122 +#: const/__init__.py:128 const/__init__.py:204 msgid "commented answer" msgstr "" -#: const/__init__.py:123 +#: const/__init__.py:129 msgid "edited question" msgstr "" -#: const/__init__.py:124 +#: const/__init__.py:130 msgid "edited answer" msgstr "" -#: const/__init__.py:125 -msgid "received award" +#: const/__init__.py:131 +msgid "received badge" msgstr "" -#: const/__init__.py:126 +#: const/__init__.py:132 msgid "marked best answer" msgstr "" -#: const/__init__.py:127 +#: const/__init__.py:133 msgid "upvoted" msgstr "" -#: const/__init__.py:128 +#: const/__init__.py:134 msgid "downvoted" msgstr "" -#: const/__init__.py:129 +#: const/__init__.py:135 msgid "canceled vote" msgstr "" -#: const/__init__.py:130 +#: const/__init__.py:136 msgid "deleted question" msgstr "" -#: const/__init__.py:131 +#: const/__init__.py:137 msgid "deleted answer" msgstr "" -#: const/__init__.py:132 +#: const/__init__.py:138 msgid "marked offensive" msgstr "" -#: const/__init__.py:133 +#: const/__init__.py:139 msgid "updated tags" msgstr "" -#: const/__init__.py:134 +#: const/__init__.py:140 msgid "selected favorite" msgstr "" -#: const/__init__.py:135 +#: const/__init__.py:141 msgid "completed user profile" msgstr "" -#: const/__init__.py:136 +#: const/__init__.py:142 msgid "email update sent to user" msgstr "" -#: const/__init__.py:139 +#: const/__init__.py:145 msgid "reminder about unanswered questions sent" msgstr "" -#: const/__init__.py:143 +#: const/__init__.py:149 msgid "reminder about accepting the best answer sent" msgstr "" -#: const/__init__.py:145 +#: const/__init__.py:151 msgid "mentioned in the post" msgstr "" -#: const/__init__.py:196 -msgid "question_answered" -msgstr "" - -#: const/__init__.py:197 -msgid "question_commented" -msgstr "" - -#: const/__init__.py:198 -msgid "answer_commented" -msgstr "" +#: const/__init__.py:202 +#, fuzzy +msgid "answered question" +msgstr "नवीनतम प्रश्नों" -#: const/__init__.py:199 -msgid "answer_accepted" -msgstr "" +#: const/__init__.py:205 +#, fuzzy +msgid "accepted answer" +msgstr "स्वयं का उत्तर स्वीकारें" -#: const/__init__.py:203 +#: const/__init__.py:209 msgid "[closed]" msgstr "" -#: const/__init__.py:204 +#: const/__init__.py:210 msgid "[deleted]" msgstr "" -#: const/__init__.py:205 views/readers.py:555 +#: const/__init__.py:211 views/readers.py:565 msgid "initial version" msgstr "" -#: const/__init__.py:206 +#: const/__init__.py:212 msgid "retagged" msgstr "" -#: const/__init__.py:214 +#: const/__init__.py:220 msgid "off" msgstr "" -#: const/__init__.py:215 +#: const/__init__.py:221 msgid "exclude ignored" msgstr "" -#: const/__init__.py:216 +#: const/__init__.py:222 msgid "only selected" msgstr "" -#: const/__init__.py:220 +#: const/__init__.py:226 msgid "instantly" msgstr "" -#: const/__init__.py:221 +#: const/__init__.py:227 msgid "daily" msgstr "" -#: const/__init__.py:222 +#: const/__init__.py:228 msgid "weekly" msgstr "" -#: const/__init__.py:223 +#: const/__init__.py:229 msgid "no email" msgstr "" -#: const/__init__.py:230 +#: const/__init__.py:236 msgid "identicon" msgstr "" -#: const/__init__.py:231 +#: const/__init__.py:237 msgid "mystery-man" msgstr "" -#: const/__init__.py:232 +#: const/__init__.py:238 msgid "monsterid" msgstr "" -#: const/__init__.py:233 +#: const/__init__.py:239 msgid "wavatar" msgstr "" -#: const/__init__.py:234 +#: const/__init__.py:240 msgid "retro" msgstr "" -#: const/__init__.py:281 skins/default/templates/badges.html:37 +#: const/__init__.py:287 skins/default/templates/badges.html:38 msgid "gold" msgstr "" -#: const/__init__.py:282 skins/default/templates/badges.html:46 +#: const/__init__.py:288 skins/default/templates/badges.html:48 msgid "silver" msgstr "" -#: const/__init__.py:283 skins/default/templates/badges.html:53 +#: const/__init__.py:289 skins/default/templates/badges.html:55 msgid "bronze" msgstr "" -#: const/__init__.py:295 +#: const/__init__.py:301 msgid "None" msgstr "" -#: const/__init__.py:296 +#: const/__init__.py:302 msgid "Gravatar" msgstr "" -#: const/__init__.py:297 +#: const/__init__.py:303 msgid "Uploaded Avatar" msgstr "" -#: const/message_keys.py:15 +#: const/message_keys.py:21 msgid "most relevant questions" msgstr "" -#: const/message_keys.py:16 +#: const/message_keys.py:22 msgid "click to see most relevant questions" msgstr "" -#: const/message_keys.py:17 -msgid "by relevance" -msgstr "" - -#: const/message_keys.py:18 +#: const/message_keys.py:24 msgid "click to see the oldest questions" msgstr "" -#: const/message_keys.py:19 -msgid "by date" +#: const/message_keys.py:25 +msgid "date" msgstr "" -#: const/message_keys.py:20 +#: const/message_keys.py:26 msgid "click to see the newest questions" msgstr "" -#: const/message_keys.py:21 +#: const/message_keys.py:27 msgid "click to see the least recently updated questions" msgstr "" -#: const/message_keys.py:22 -msgid "by activity" +#: const/message_keys.py:28 +#: skins/default/templates/user_profile/user_recent.html:4 +#: skins/default/templates/user_profile/user_tabs.html:29 +#: skins/default/templates/user_profile/user_tabs.html:31 +msgid "activity" msgstr "" -#: const/message_keys.py:23 +#: const/message_keys.py:29 msgid "click to see the most recently updated questions" msgstr "" -#: const/message_keys.py:24 +#: const/message_keys.py:30 msgid "click to see the least answered questions" msgstr "" -#: const/message_keys.py:25 -msgid "by answers" -msgstr "" +#: const/message_keys.py:31 +#, fuzzy +msgid "answers" +msgstr "answers/" -#: const/message_keys.py:26 +#: const/message_keys.py:32 msgid "click to see the most answered questions" msgstr "" -#: const/message_keys.py:27 +#: const/message_keys.py:33 msgid "click to see least voted questions" msgstr "" -#: const/message_keys.py:28 -msgid "by votes" +#: const/message_keys.py:34 +#: skins/default/templates/user_profile/user_tabs.html:36 +#: skins/default/templates/user_profile/user_votes.html:4 +msgid "votes" msgstr "" -#: const/message_keys.py:29 +#: const/message_keys.py:35 msgid "click to see most voted questions" msgstr "" -#: deps/django_authopenid/backends.py:88 +#: const/message_keys.py:40 +msgid "" +"Sorry, your account appears to be blocked and you cannot make new posts " +"until this issue is resolved. Please contact the forum administrator to " +"reach a resolution." +msgstr "" + +#: const/message_keys.py:45 models/__init__.py:787 +msgid "" +"Sorry, your account appears to be suspended and you cannot make new posts " +"until this issue is resolved. You can, however edit your existing posts. " +"Please contact the forum administrator to reach a resolution." +msgstr "" + +#: deps/django_authopenid/backends.py:166 msgid "" "Welcome! Please set email address (important!) in your profile and adjust " "screen name, if necessary." @@ -2393,7 +2540,7 @@ msgid "Your user name (<i>required</i>)" msgstr "" #: deps/django_authopenid/forms.py:450 -msgid "Incorrect username." +msgid "sorry, there is no such user name" msgstr "" #: deps/django_authopenid/urls.py:9 deps/django_authopenid/urls.py:12 @@ -2522,71 +2669,71 @@ msgstr "" msgid "OpenID %(openid_url)s is invalid" msgstr "" -#: deps/django_authopenid/views.py:261 deps/django_authopenid/views.py:412 -#: deps/django_authopenid/views.py:440 +#: deps/django_authopenid/views.py:261 deps/django_authopenid/views.py:408 +#: deps/django_authopenid/views.py:436 #, python-format msgid "" "Unfortunately, there was some problem when connecting to %(provider)s, " "please try again or use another provider" msgstr "" -#: deps/django_authopenid/views.py:362 +#: deps/django_authopenid/views.py:358 msgid "Your new password saved" msgstr "" -#: deps/django_authopenid/views.py:466 +#: deps/django_authopenid/views.py:462 msgid "The login password combination was not correct" msgstr "" -#: deps/django_authopenid/views.py:568 +#: deps/django_authopenid/views.py:564 msgid "Please click any of the icons below to sign in" msgstr "" -#: deps/django_authopenid/views.py:570 +#: deps/django_authopenid/views.py:566 msgid "Account recovery email sent" msgstr "" -#: deps/django_authopenid/views.py:573 +#: deps/django_authopenid/views.py:569 msgid "Please add one or more login methods." msgstr "" -#: deps/django_authopenid/views.py:575 +#: deps/django_authopenid/views.py:571 msgid "If you wish, please add, remove or re-validate your login methods" msgstr "" -#: deps/django_authopenid/views.py:577 +#: deps/django_authopenid/views.py:573 msgid "Please wait a second! Your account is recovered, but ..." msgstr "" -#: deps/django_authopenid/views.py:579 +#: deps/django_authopenid/views.py:575 msgid "Sorry, this account recovery key has expired or is invalid" msgstr "" -#: deps/django_authopenid/views.py:652 +#: deps/django_authopenid/views.py:648 #, python-format msgid "Login method %(provider_name)s does not exist" msgstr "" -#: deps/django_authopenid/views.py:658 +#: deps/django_authopenid/views.py:654 msgid "Oops, sorry - there was some error - please try again" msgstr "" -#: deps/django_authopenid/views.py:749 +#: deps/django_authopenid/views.py:745 #, python-format msgid "Your %(provider)s login works fine" msgstr "" -#: deps/django_authopenid/views.py:1060 deps/django_authopenid/views.py:1066 +#: deps/django_authopenid/views.py:1056 deps/django_authopenid/views.py:1062 #, python-format msgid "your email needs to be validated see %(details_url)s" msgstr "" -#: deps/django_authopenid/views.py:1087 +#: deps/django_authopenid/views.py:1083 #, python-format msgid "Recover your %(site)s account" msgstr "" -#: deps/django_authopenid/views.py:1159 +#: deps/django_authopenid/views.py:1155 msgid "Please check your email and visit the enclosed link." msgstr "" @@ -2691,15 +2838,6 @@ msgstr "" msgid "Congratulations, you are now an Administrator" msgstr "" -#: management/commands/initialize_ldap_logins.py:51 -msgid "" -"This command may help you migrate to LDAP password authentication by " -"creating a record for LDAP association with each user account. There is an " -"assumption that ldap user id's are the same as user names registered at the " -"site. Before running this command it is necessary to set up LDAP parameters " -"in the \"External keys\" section of the site settings." -msgstr "" - #: management/commands/post_emailed_questions.py:35 msgid "" "<p>To ask by email, please:</p>\n" @@ -2721,8 +2859,8 @@ msgstr "" #: management/commands/post_emailed_questions.py:61 #, python-format msgid "" -"<p>Sorry, in order to post questions on %(site)s by email, please <a " -"href=\"%(url)s\">register first</a></p>" +"<p>Sorry, in order to post questions on %(site)s by email, please <a href=" +"\"%(url)s\">register first</a></p>" msgstr "" #: management/commands/post_emailed_questions.py:69 @@ -2731,46 +2869,52 @@ msgid "" "of your user account</p>" msgstr "" -#: management/commands/send_accept_answer_reminders.py:56 +#: management/commands/send_accept_answer_reminders.py:58 #, python-format msgid "Accept the best answer for %(question_count)d of your questions" msgstr "" -#: management/commands/send_accept_answer_reminders.py:61 +#: management/commands/send_accept_answer_reminders.py:63 msgid "Please accept the best answer for this question:" msgstr "" -#: management/commands/send_accept_answer_reminders.py:63 +#: management/commands/send_accept_answer_reminders.py:65 msgid "Please accept the best answer for these questions:" msgstr "" -#: management/commands/send_email_alerts.py:413 +#: management/commands/send_email_alerts.py:414 #, python-format msgid "%(question_count)d updated question about %(topics)s" msgid_plural "%(question_count)d updated questions about %(topics)s" msgstr[0] "" msgstr[1] "" -#: management/commands/send_email_alerts.py:423 +#: management/commands/send_email_alerts.py:425 #, python-format -msgid "%(name)s, this is an update message header for %(num)d question" +msgid "" +"<p>Dear %(name)s,</p><p>The following question has been updated " +"%(sitename)s</p>" msgid_plural "" -"%(name)s, this is an update message header for %(num)d questions" +"<p>Dear %(name)s,</p><p>The following %(num)d questions have been updated on " +"%(sitename)s:</p>" msgstr[0] "" msgstr[1] "" -#: management/commands/send_email_alerts.py:440 +#: management/commands/send_email_alerts.py:449 msgid "new question" msgstr "" -#: management/commands/send_email_alerts.py:465 +#: management/commands/send_email_alerts.py:474 #, python-format msgid "" -"go to %(email_settings_link)s to change frequency of email updates or " -"%(admin_email)s administrator" +"<p>Please remember that you can always <a hrefl\"%(email_settings_link)s" +"\">adjust</a> frequency of the email updates or turn them off entirely.<br/" +">If you believe that this message was sent in an error, please email about " +"it the forum administrator at %(admin_email)s.</p><p>Sincerely,</p><p>Your " +"friendly %(sitename)s server.</p>" msgstr "" -#: management/commands/send_unanswered_question_reminders.py:58 +#: management/commands/send_unanswered_question_reminders.py:60 #, python-format msgid "%(question_count)d unanswered question about %(topics)s" msgid_plural "%(question_count)d unanswered questions about %(topics)s" @@ -2782,83 +2926,74 @@ msgstr[1] "" msgid "Please log in to use %s" msgstr "" -#: models/__init__.py:317 +#: models/__init__.py:319 msgid "" "Sorry, you cannot accept or unaccept best answers because your account is " "blocked" msgstr "" -#: models/__init__.py:321 +#: models/__init__.py:323 msgid "" "Sorry, you cannot accept or unaccept best answers because your account is " "suspended" msgstr "" -#: models/__init__.py:334 +#: models/__init__.py:336 #, python-format msgid "" ">%(points)s points required to accept or unaccept your own answer to your " "own question" msgstr "" -#: models/__init__.py:356 +#: models/__init__.py:358 #, python-format msgid "" "Sorry, you will be able to accept this answer only after %(will_be_able_at)s" msgstr "" -#: models/__init__.py:364 +#: models/__init__.py:366 #, python-format msgid "" "Sorry, only moderators or original author of the question - %(username)s - " "can accept or unaccept the best answer" msgstr "" -#: models/__init__.py:386 -msgid "cannot vote for own posts" +#: models/__init__.py:389 +msgid "Sorry, you cannot vote for your own posts" msgstr "" -#: models/__init__.py:389 +#: models/__init__.py:393 msgid "Sorry your account appears to be blocked " msgstr "" -#: models/__init__.py:394 +#: models/__init__.py:398 msgid "Sorry your account appears to be suspended " msgstr "" -#: models/__init__.py:404 +#: models/__init__.py:408 #, python-format msgid ">%(points)s points required to upvote" msgstr "" -#: models/__init__.py:410 +#: models/__init__.py:414 #, python-format msgid ">%(points)s points required to downvote" msgstr "" -#: models/__init__.py:425 +#: models/__init__.py:429 msgid "Sorry, blocked users cannot upload files" msgstr "" -#: models/__init__.py:426 +#: models/__init__.py:430 msgid "Sorry, suspended users cannot upload files" msgstr "" -#: models/__init__.py:428 +#: models/__init__.py:432 #, python-format -msgid "" -"uploading images is limited to users with >%(min_rep)s reputation points" -msgstr "" - -#: models/__init__.py:447 models/__init__.py:514 models/__init__.py:980 -msgid "blocked users cannot post" -msgstr "" - -#: models/__init__.py:448 models/__init__.py:983 -msgid "suspended users cannot post" +msgid "sorry, file uploading requires karma >%(min_rep)s" msgstr "" -#: models/__init__.py:475 +#: models/__init__.py:481 #, python-format msgid "" "Sorry, comments (except the last one) are editable only within %(minutes)s " @@ -2869,57 +3004,56 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: models/__init__.py:487 +#: models/__init__.py:493 msgid "Sorry, but only post owners or moderators can edit comments" msgstr "" -#: models/__init__.py:500 +#: models/__init__.py:518 msgid "" "Sorry, since your account is suspended you can comment only your own posts" msgstr "" -#: models/__init__.py:504 +#: models/__init__.py:522 #, python-format msgid "" "Sorry, to comment any post a minimum reputation of %(min_rep)s points is " "required. You can still comment your own posts and answers to your questions" msgstr "" -#: models/__init__.py:532 +#: models/__init__.py:552 msgid "" "This post has been deleted and can be seen only by post owners, site " "administrators and moderators" msgstr "" -#: models/__init__.py:549 +#: models/__init__.py:569 msgid "" -"Sorry, only moderators, site administrators and post owners can edit deleted" -" posts" +"Sorry, only moderators, site administrators and post owners can edit deleted " +"posts" msgstr "" -#: models/__init__.py:564 +#: models/__init__.py:584 msgid "Sorry, since your account is blocked you cannot edit posts" msgstr "" -#: models/__init__.py:568 -msgid "" -"Sorry, since your account is suspended you can edit only your own posts" +#: models/__init__.py:588 +msgid "Sorry, since your account is suspended you can edit only your own posts" msgstr "" -#: models/__init__.py:573 +#: models/__init__.py:593 #, python-format msgid "" "Sorry, to edit wiki posts, a minimum reputation of %(min_rep)s is required" msgstr "" -#: models/__init__.py:580 +#: models/__init__.py:600 #, python-format msgid "" "Sorry, to edit other people's posts, a minimum reputation of %(min_rep)s is " "required" msgstr "" -#: models/__init__.py:643 +#: models/__init__.py:663 msgid "" "Sorry, cannot delete your question since it has an upvoted answer posted by " "someone else" @@ -2929,267 +3063,269 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: models/__init__.py:658 +#: models/__init__.py:678 msgid "Sorry, since your account is blocked you cannot delete posts" msgstr "" -#: models/__init__.py:662 +#: models/__init__.py:682 msgid "" "Sorry, since your account is suspended you can delete only your own posts" msgstr "" -#: models/__init__.py:666 +#: models/__init__.py:686 #, python-format msgid "" "Sorry, to deleted other people' posts, a minimum reputation of %(min_rep)s " "is required" msgstr "" -#: models/__init__.py:686 +#: models/__init__.py:706 msgid "Sorry, since your account is blocked you cannot close questions" msgstr "" -#: models/__init__.py:690 +#: models/__init__.py:710 msgid "Sorry, since your account is suspended you cannot close questions" msgstr "" -#: models/__init__.py:694 +#: models/__init__.py:714 #, python-format msgid "" "Sorry, to close other people' posts, a minimum reputation of %(min_rep)s is " "required" msgstr "" -#: models/__init__.py:703 +#: models/__init__.py:723 #, python-format msgid "" "Sorry, to close own question a minimum reputation of %(min_rep)s is required" msgstr "" -#: models/__init__.py:727 +#: models/__init__.py:747 #, python-format msgid "" "Sorry, only administrators, moderators or post owners with reputation > " "%(min_rep)s can reopen questions." msgstr "" -#: models/__init__.py:733 +#: models/__init__.py:753 #, python-format msgid "" -"Sorry, to reopen own question a minimum reputation of %(min_rep)s is " -"required" +"Sorry, to reopen own question a minimum reputation of %(min_rep)s is required" msgstr "" -#: models/__init__.py:753 -msgid "cannot flag message as offensive twice" -msgstr "" - -#: models/__init__.py:758 -msgid "blocked users cannot flag posts" +#: models/__init__.py:774 +msgid "You have flagged this question before and cannot do it more than once" msgstr "" -#: models/__init__.py:760 -msgid "suspended users cannot flag posts" +#: models/__init__.py:782 +msgid "Sorry, since your account is blocked you cannot flag posts as offensive" msgstr "" -#: models/__init__.py:762 +#: models/__init__.py:793 #, python-format -msgid "need > %(min_rep)s points to flag spam" +msgid "" +"Sorry, to flag posts as offensive a minimum reputation of %(min_rep)s is " +"required" msgstr "" -#: models/__init__.py:781 +#: models/__init__.py:814 #, python-format -msgid "%(max_flags_per_day)s exceeded" +msgid "" +"Sorry, you have exhausted the maximum number of %(max_flags_per_day)s " +"offensive flags per day." msgstr "" -#: models/__init__.py:792 +#: models/__init__.py:826 msgid "cannot remove non-existing flag" msgstr "" -#: models/__init__.py:797 -msgid "blocked users cannot remove flags" +#: models/__init__.py:832 +msgid "Sorry, since your account is blocked you cannot remove flags" msgstr "" -#: models/__init__.py:799 -msgid "suspended users cannot remove flags" +#: models/__init__.py:836 +msgid "" +"Sorry, your account appears to be suspended and you cannot remove flags. " +"Please contact the forum administrator to reach a resolution." msgstr "" -#: models/__init__.py:803 +#: models/__init__.py:842 #, python-format -msgid "need > %(min_rep)d point to remove flag" -msgid_plural "need > %(min_rep)d points to remove flag" +msgid "Sorry, to flag posts a minimum reputation of %(min_rep)d is required" +msgid_plural "" +"Sorry, to flag posts a minimum reputation of %(min_rep)d is required" msgstr[0] "" msgstr[1] "" -#: models/__init__.py:822 +#: models/__init__.py:861 msgid "you don't have the permission to remove all flags" msgstr "" -#: models/__init__.py:823 +#: models/__init__.py:862 msgid "no flags for this entry" msgstr "" -#: models/__init__.py:847 +#: models/__init__.py:886 msgid "" "Sorry, only question owners, site administrators and moderators can retag " "deleted questions" msgstr "" -#: models/__init__.py:854 +#: models/__init__.py:893 msgid "Sorry, since your account is blocked you cannot retag questions" msgstr "" -#: models/__init__.py:858 +#: models/__init__.py:897 msgid "" "Sorry, since your account is suspended you can retag only your own questions" msgstr "" -#: models/__init__.py:862 +#: models/__init__.py:901 #, python-format msgid "" "Sorry, to retag questions a minimum reputation of %(min_rep)s is required" msgstr "" -#: models/__init__.py:881 +#: models/__init__.py:920 msgid "Sorry, since your account is blocked you cannot delete comment" msgstr "" -#: models/__init__.py:885 +#: models/__init__.py:924 msgid "" "Sorry, since your account is suspended you can delete only your own comments" msgstr "" -#: models/__init__.py:889 +#: models/__init__.py:928 #, python-format msgid "Sorry, to delete comments reputation of %(min_rep)s is required" msgstr "" -#: models/__init__.py:912 -msgid "cannot revoke old vote" +#: models/__init__.py:952 +msgid "sorry, but older votes cannot be revoked" msgstr "" -#: models/__init__.py:1387 utils/functions.py:78 +#: models/__init__.py:1438 utils/functions.py:78 #, python-format msgid "on %(date)s" msgstr "" -#: models/__init__.py:1389 +#: models/__init__.py:1440 msgid "in two days" msgstr "" -#: models/__init__.py:1391 +#: models/__init__.py:1442 msgid "tomorrow" msgstr "" -#: models/__init__.py:1393 +#: models/__init__.py:1444 #, python-format msgid "in %(hr)d hour" msgid_plural "in %(hr)d hours" msgstr[0] "" msgstr[1] "" -#: models/__init__.py:1395 +#: models/__init__.py:1446 #, python-format msgid "in %(min)d min" msgid_plural "in %(min)d mins" msgstr[0] "" msgstr[1] "" -#: models/__init__.py:1396 +#: models/__init__.py:1447 #, python-format msgid "%(days)d day" msgid_plural "%(days)d days" msgstr[0] "" msgstr[1] "" -#: models/__init__.py:1398 +#: models/__init__.py:1449 #, python-format msgid "" "New users must wait %(days)s before answering their own question. You can " "post an answer %(left)s" msgstr "" -#: models/__init__.py:1565 skins/default/templates/feedback_email.txt:9 +#: models/__init__.py:1622 skins/default/templates/feedback_email.txt:9 msgid "Anonymous" msgstr "" -#: models/__init__.py:1661 +#: models/__init__.py:1718 msgid "Site Adminstrator" msgstr "" -#: models/__init__.py:1663 +#: models/__init__.py:1720 msgid "Forum Moderator" msgstr "" -#: models/__init__.py:1665 +#: models/__init__.py:1722 msgid "Suspended User" msgstr "" -#: models/__init__.py:1667 +#: models/__init__.py:1724 msgid "Blocked User" msgstr "" -#: models/__init__.py:1669 +#: models/__init__.py:1726 msgid "Registered User" msgstr "" -#: models/__init__.py:1671 +#: models/__init__.py:1728 msgid "Watched User" msgstr "" -#: models/__init__.py:1673 +#: models/__init__.py:1730 msgid "Approved User" msgstr "" -#: models/__init__.py:1782 +#: models/__init__.py:1839 #, python-format msgid "%(username)s karma is %(reputation)s" msgstr "" -#: models/__init__.py:1792 +#: models/__init__.py:1849 #, python-format msgid "one gold badge" msgid_plural "%(count)d gold badges" msgstr[0] "" msgstr[1] "" -#: models/__init__.py:1799 +#: models/__init__.py:1856 #, python-format msgid "one silver badge" msgid_plural "%(count)d silver badges" msgstr[0] "" msgstr[1] "" -#: models/__init__.py:1806 +#: models/__init__.py:1863 #, python-format msgid "one bronze badge" msgid_plural "%(count)d bronze badges" msgstr[0] "" msgstr[1] "" -#: models/__init__.py:1817 +#: models/__init__.py:1874 #, python-format msgid "%(item1)s and %(item2)s" msgstr "" -#: models/__init__.py:1821 +#: models/__init__.py:1878 #, python-format msgid "%(user)s has %(badges)s" msgstr "" -#: models/__init__.py:2287 +#: models/__init__.py:2354 #, python-format msgid "\"%(title)s\"" msgstr "" -#: models/__init__.py:2424 +#: models/__init__.py:2491 #, python-format msgid "" "Congratulations, you have received a badge '%(badge_name)s'. Check out <a " "href=\"%(user_profile)s\">your profile</a>." msgstr "" -#: models/__init__.py:2626 views/commands.py:445 +#: models/__init__.py:2694 views/commands.py:457 msgid "Your tag subscription was saved, thanks!" msgstr "" @@ -3455,54 +3591,54 @@ msgstr "" msgid "Very active in one tag" msgstr "" -#: models/post.py:1056 +#: models/post.py:1071 msgid "Sorry, this question has been deleted and is no longer accessible" msgstr "" -#: models/post.py:1072 +#: models/post.py:1087 msgid "" "Sorry, the answer you are looking for is no longer available, because the " "parent question has been removed" msgstr "" -#: models/post.py:1079 +#: models/post.py:1094 msgid "Sorry, this answer has been removed and is no longer accessible" msgstr "" -#: models/post.py:1095 +#: models/post.py:1110 msgid "" "Sorry, the comment you are looking for is no longer accessible, because the " "parent question has been removed" msgstr "" -#: models/post.py:1102 +#: models/post.py:1117 msgid "" "Sorry, the comment you are looking for is no longer accessible, because the " "parent answer has been removed" msgstr "" -#: models/question.py:51 +#: models/question.py:54 #, python-format msgid "\" and \"%s\"" msgstr "" -#: models/question.py:54 +#: models/question.py:57 msgid "\" and more" msgstr "" -#: models/repute.py:141 +#: models/repute.py:143 #, python-format msgid "<em>Changed by moderator. Reason:</em> %(reason)s" msgstr "" -#: models/repute.py:152 +#: models/repute.py:154 #, python-format msgid "" "%(points)s points were added for %(username)s's contribution to question " "%(question_title)s" msgstr "" -#: models/repute.py:157 +#: models/repute.py:159 #, python-format msgid "" "%(points)s points were subtracted for %(username)s's contribution to " @@ -3563,13 +3699,14 @@ msgid "(or select another login method above)" msgstr "" #: skins/common/templates/authopenid/authopenid_macros.html:56 +#: skins/common/templates/authopenid/signin.html:106 msgid "Sign in" msgstr "" #: skins/common/templates/authopenid/changeemail.html:2 #: skins/common/templates/authopenid/changeemail.html:8 -#: skins/common/templates/authopenid/changeemail.html:36 -msgid "Change email" +#: skins/common/templates/authopenid/changeemail.html:49 +msgid "Change Email" msgstr "" #: skins/common/templates/authopenid/changeemail.html:10 @@ -3578,27 +3715,38 @@ msgstr "" #: skins/common/templates/authopenid/changeemail.html:15 #, python-format -msgid "change %(email)s info" +msgid "" +"<span class=\\\"strong big\\\">Enter your new email into the box below</" +"span> if \n" +"you'd like to use another email for <strong>update subscriptions</strong>.\n" +"<br>Currently you are using <strong>%%(email)s</strong>" msgstr "" -#: skins/common/templates/authopenid/changeemail.html:17 +#: skins/common/templates/authopenid/changeemail.html:19 #, python-format -msgid "here is why email is required, see %(gravatar_faq_url)s" -msgstr "" - -#: skins/common/templates/authopenid/changeemail.html:29 -msgid "Your new Email" +msgid "" +"<span class='strong big'>Please enter your email address in the box below.</" +"span>\n" +"Valid email address is required on this Q&A forum. If you like, \n" +"you can <strong>receive updates</strong> on interesting questions or entire\n" +"forum via email. Also, your email is used to create a unique \n" +"<a href='%%(gravatar_faq_url)s'><strong>gravatar</strong></a> image for " +"your\n" +"account. Email addresses are never shown or otherwise shared with anybody\n" +"else." msgstr "" -#: skins/common/templates/authopenid/changeemail.html:29 -msgid "Your Email" +#: skins/common/templates/authopenid/changeemail.html:38 +msgid "" +"<strong>Your new Email:</strong> \n" +"(will <strong>not</strong> be shown to anyone, must be valid)" msgstr "" -#: skins/common/templates/authopenid/changeemail.html:36 +#: skins/common/templates/authopenid/changeemail.html:49 msgid "Save Email" msgstr "" -#: skins/common/templates/authopenid/changeemail.html:38 +#: skins/common/templates/authopenid/changeemail.html:51 #: skins/default/templates/answer_edit.html:25 #: skins/default/templates/close.html:16 #: skins/default/templates/feedback.html:64 @@ -3606,111 +3754,109 @@ msgstr "" #: skins/default/templates/question_retag.html:22 #: skins/default/templates/reopen.html:27 #: skins/default/templates/subscribe_for_tags.html:16 -#: skins/default/templates/user_profile/user_edit.html:103 +#: skins/default/templates/user_profile/user_edit.html:102 msgid "Cancel" msgstr "" -#: skins/common/templates/authopenid/changeemail.html:45 +#: skins/common/templates/authopenid/changeemail.html:58 msgid "Validate email" msgstr "" -#: skins/common/templates/authopenid/changeemail.html:48 +#: skins/common/templates/authopenid/changeemail.html:61 #, python-format -msgid "validate %(email)s info or go to %(change_email_url)s" +msgid "" +"<span class=\\\"strong big\\\">An email with a validation link has been sent " +"to \n" +"%%(email)s.</span> Please <strong>follow the emailed link</strong> with " +"your \n" +"web browser. Email validation is necessary to help insure the proper use " +"of \n" +"email on <span class=\\\"orange\\\">Q&A</span>. If you would like to " +"use \n" +"<strong>another email</strong>, please <a \n" +"href='%%(change_email_url)s'><strong>change it again</strong></a>." msgstr "" -#: skins/common/templates/authopenid/changeemail.html:52 +#: skins/common/templates/authopenid/changeemail.html:70 msgid "Email not changed" msgstr "" -#: skins/common/templates/authopenid/changeemail.html:55 +#: skins/common/templates/authopenid/changeemail.html:73 #, python-format -msgid "old %(email)s kept, if you like go to %(change_email_url)s" +msgid "" +"<span class=\\\"strong big\\\">Your email address %%(email)s has not been " +"changed.\n" +"</span> If you decide to change it later - you can always do it by editing \n" +"it in your user profile or by using the <a \n" +"href='%%(change_email_url)s'><strong>previous form</strong></a> again." msgstr "" -#: skins/common/templates/authopenid/changeemail.html:59 +#: skins/common/templates/authopenid/changeemail.html:80 msgid "Email changed" msgstr "" -#: skins/common/templates/authopenid/changeemail.html:62 +#: skins/common/templates/authopenid/changeemail.html:83 #, python-format -msgid "your current %(email)s can be used for this" +msgid "" +"\n" +"<span class='big strong'>Your email address is now set to %%(email)s.</" +"span> \n" +"Updates on the questions that you like most will be sent to this address. \n" +"Email notifications are sent once a day or less frequently - only when " +"there \n" +"are any news." msgstr "" -#: skins/common/templates/authopenid/changeemail.html:66 +#: skins/common/templates/authopenid/changeemail.html:91 msgid "Email verified" msgstr "" -#: skins/common/templates/authopenid/changeemail.html:69 -msgid "thanks for verifying email" +#: skins/common/templates/authopenid/changeemail.html:94 +msgid "" +"<span class=\\\"big strong\\\">Thank you for verifying your email!</span> " +"Now \n" +"you can <strong>ask</strong> and <strong>answer</strong> questions. Also " +"if \n" +"you find a very interesting question you can <strong>subscribe for the \n" +"updates</strong> - then will be notified about changes <strong>once a day</" +"strong>\n" +"or less frequently." msgstr "" -#: skins/common/templates/authopenid/changeemail.html:73 -msgid "email key not sent" +#: skins/common/templates/authopenid/changeemail.html:102 +msgid "Validation email not sent" msgstr "" -#: skins/common/templates/authopenid/changeemail.html:76 +#: skins/common/templates/authopenid/changeemail.html:105 #, python-format -msgid "email key not sent %(email)s change email here %(change_link)s" +msgid "" +"<span class='big strong'>Your current email address %%(email)s has been \n" +"validated before</span> so the new key was not sent. You can <a \n" +"href='%%(change_link)s'>change</a> email used for update subscriptions if \n" +"necessary." msgstr "" #: skins/common/templates/authopenid/complete.html:21 -#: skins/common/templates/authopenid/complete.html:23 msgid "Registration" msgstr "" -#: skins/common/templates/authopenid/complete.html:27 -#, python-format -msgid "register new %(provider)s account info, see %(gravatar_faq_url)s" -msgstr "" - -#: skins/common/templates/authopenid/complete.html:30 -#, python-format -msgid "" -"%(username)s already exists, choose another name for \n" -" %(provider)s. Email is required too, see %(gravatar_faq_url)s\n" -" " -msgstr "" - -#: skins/common/templates/authopenid/complete.html:34 -#, python-format -msgid "" -"register new external %(provider)s account info, see %(gravatar_faq_url)s" -msgstr "" - -#: skins/common/templates/authopenid/complete.html:37 -#, python-format -msgid "register new Facebook connect account info, see %(gravatar_faq_url)s" -msgstr "" - -#: skins/common/templates/authopenid/complete.html:40 -msgid "This account already exists, please use another." -msgstr "" - -#: skins/common/templates/authopenid/complete.html:59 -msgid "Screen name label" -msgstr "" - -#: skins/common/templates/authopenid/complete.html:66 -msgid "Email address label" +#: skins/common/templates/authopenid/complete.html:23 +msgid "User registration" msgstr "" -#: skins/common/templates/authopenid/complete.html:72 -#: skins/common/templates/authopenid/signup_with_password.html:36 -msgid "receive updates motivational blurb" +#: skins/common/templates/authopenid/complete.html:60 +msgid "<strong>Receive forum updates by email</strong>" msgstr "" -#: skins/common/templates/authopenid/complete.html:76 -#: skins/common/templates/authopenid/signup_with_password.html:40 +#: skins/common/templates/authopenid/complete.html:64 +#: skins/common/templates/authopenid/signup_with_password.html:46 msgid "please select one of the options above" msgstr "" -#: skins/common/templates/authopenid/complete.html:79 -msgid "Tag filter tool will be your right panel, once you log in." -msgstr "" - -#: skins/common/templates/authopenid/complete.html:80 -msgid "create account" +#: skins/common/templates/authopenid/complete.html:67 +#: skins/common/templates/authopenid/signup_with_password.html:4 +#: skins/common/templates/authopenid/signup_with_password.html:53 +msgid "Signup" msgstr "" #: skins/common/templates/authopenid/confirm_email.txt:1 @@ -3737,7 +3883,7 @@ msgstr "" #: skins/common/templates/authopenid/email_validation.txt:13 msgid "" "Sincerely,\n" -"Forum Administrator" +"Q&A Forum Administrator" msgstr "" #: skins/common/templates/authopenid/email_validation.txt:1 @@ -3795,22 +3941,22 @@ msgstr "" #: skins/common/templates/authopenid/signin.html:28 msgid "" -"Take a pick of your favorite service below to sign in using secure OpenID or" -" similar technology. Your external service password always stays " -"confidential and you don't have to rememeber or create another one." +"Take a pick of your favorite service below to sign in using secure OpenID or " +"similar technology. Your external service password always stays confidential " +"and you don't have to rememeber or create another one." msgstr "" #: skins/common/templates/authopenid/signin.html:31 msgid "" "It's a good idea to make sure that your existing login methods still work, " -"or add a new one. Please click any of the icons below to check/change or add" -" new login methods." +"or add a new one. Please click any of the icons below to check/change or add " +"new login methods." msgstr "" #: skins/common/templates/authopenid/signin.html:33 msgid "" -"Please add a more permanent login method by clicking one of the icons below," -" to avoid logging in via email each time." +"Please add a more permanent login method by clicking one of the icons below, " +"to avoid logging in via email each time." msgstr "" #: skins/common/templates/authopenid/signin.html:37 @@ -3843,14 +3989,10 @@ msgstr "" msgid "Login or email" msgstr "" -#: skins/common/templates/authopenid/signin.html:101 +#: skins/common/templates/authopenid/signin.html:101 utils/forms.py:169 msgid "Password" msgstr "" -#: skins/common/templates/authopenid/signin.html:106 -msgid "Login" -msgstr "" - #: skins/common/templates/authopenid/signin.html:113 msgid "To change your password - please enter the new one twice, then submit" msgstr "" @@ -3880,8 +4022,8 @@ msgid "delete, if you like" msgstr "" #: skins/common/templates/authopenid/signin.html:170 -#: skins/common/templates/question/answer_controls.html:34 -#: skins/common/templates/question/question_controls.html:38 +#: skins/common/templates/question/answer_controls.html:13 +#: skins/common/templates/question/question_controls.html:10 msgid "delete" msgstr "" @@ -3913,38 +4055,6 @@ msgstr "" msgid "Recover your account via email" msgstr "" -#: skins/common/templates/authopenid/signin.html:220 -msgid "Why use OpenID?" -msgstr "" - -#: skins/common/templates/authopenid/signin.html:223 -msgid "with openid it is easier" -msgstr "" - -#: skins/common/templates/authopenid/signin.html:226 -msgid "reuse openid" -msgstr "" - -#: skins/common/templates/authopenid/signin.html:229 -msgid "openid is widely adopted" -msgstr "" - -#: skins/common/templates/authopenid/signin.html:232 -msgid "openid is supported open standard" -msgstr "" - -#: skins/common/templates/authopenid/signin.html:236 -msgid "Find out more" -msgstr "" - -#: skins/common/templates/authopenid/signin.html:237 -msgid "Get OpenID" -msgstr "" - -#: skins/common/templates/authopenid/signup_with_password.html:4 -msgid "Signup" -msgstr "" - #: skins/common/templates/authopenid/signup_with_password.html:10 msgid "Please register by clicking on any of the icons below" msgstr "" @@ -3958,24 +4068,29 @@ msgid "Create login name and password" msgstr "" #: skins/common/templates/authopenid/signup_with_password.html:26 -msgid "Traditional signup info" +msgid "" +"<span class='strong big'>If you prefer, create your forum login name and \n" +"password here. However</span>, please keep in mind that we also support \n" +"<strong>OpenID</strong> login method. With <strong>OpenID</strong> you can \n" +"simply reuse your external login (e.g. Gmail or AOL) without ever sharing \n" +"your login details with anyone and having to remember yet another password." msgstr "" -#: skins/common/templates/authopenid/signup_with_password.html:44 +#: skins/common/templates/authopenid/signup_with_password.html:41 +msgid "<strong>Receive periodic updates by email</strong>" +msgstr "" + +#: skins/common/templates/authopenid/signup_with_password.html:50 msgid "" "Please read and type in the two words below to help us prevent automated " "account creation." msgstr "" -#: skins/common/templates/authopenid/signup_with_password.html:47 -msgid "Create Account" -msgstr "" - -#: skins/common/templates/authopenid/signup_with_password.html:49 +#: skins/common/templates/authopenid/signup_with_password.html:55 msgid "or" msgstr "" -#: skins/common/templates/authopenid/signup_with_password.html:50 +#: skins/common/templates/authopenid/signup_with_password.html:56 msgid "return to OpenID login" msgstr "" @@ -4024,73 +4139,81 @@ msgstr "" #: skins/common/templates/avatar/confirm_delete.html:6 #, python-format msgid "" -"You have no avatars to delete. Please <a " -"href=\"%(avatar_change_url)s\">upload one</a> now." +"You have no avatars to delete. Please <a href=\"%(avatar_change_url)s" +"\">upload one</a> now." msgstr "" #: skins/common/templates/avatar/confirm_delete.html:12 msgid "Delete These" msgstr "" -#: skins/common/templates/question/answer_controls.html:5 -msgid "answer permanent link" +#: skins/common/templates/question/answer_controls.html:2 +msgid "swap with question" msgstr "" -#: skins/common/templates/question/answer_controls.html:6 +#: skins/common/templates/question/answer_controls.html:7 msgid "permanent link" msgstr "" -#: skins/common/templates/question/answer_controls.html:11 -#: skins/common/templates/question/question_controls.html:3 -#: skins/default/templates/macros.html:313 -#: skins/default/templates/revisions.html:38 -#: skins/default/templates/revisions.html:41 -msgid "edit" +#: skins/common/templates/question/answer_controls.html:8 +#: skins/default/templates/widgets/answer_edit_tips.html:45 +#: skins/default/templates/widgets/question_edit_tips.html:40 +msgid "link" +msgstr "" + +#: skins/common/templates/question/answer_controls.html:13 +#: skins/common/templates/question/question_controls.html:10 +msgid "undelete" msgstr "" -#: skins/common/templates/question/answer_controls.html:15 -#: skins/common/templates/question/answer_controls.html:23 +#: skins/common/templates/question/answer_controls.html:19 +#, fuzzy +msgid "remove offensive flag" +msgstr "आपत्तिजनक ध्वजों को देखे" + +#: skins/common/templates/question/answer_controls.html:21 #: skins/common/templates/question/question_controls.html:22 -#: skins/common/templates/question/question_controls.html:30 +msgid "remove flag" +msgstr "" + +#: skins/common/templates/question/answer_controls.html:26 +#: skins/common/templates/question/answer_controls.html:35 +#: skins/common/templates/question/question_controls.html:20 +#: skins/common/templates/question/question_controls.html:26 +#: skins/common/templates/question/question_controls.html:33 msgid "" "report as offensive (i.e containing spam, advertising, malicious text, etc.)" msgstr "" -#: skins/common/templates/question/answer_controls.html:16 -#: skins/common/templates/question/question_controls.html:23 +#: skins/common/templates/question/answer_controls.html:28 +#: skins/common/templates/question/answer_controls.html:37 +#: skins/common/templates/question/question_controls.html:28 +#: skins/common/templates/question/question_controls.html:35 msgid "flag offensive" msgstr "" -#: skins/common/templates/question/answer_controls.html:24 -#: skins/common/templates/question/question_controls.html:31 -msgid "remove flag" -msgstr "" - -#: skins/common/templates/question/answer_controls.html:34 -#: skins/common/templates/question/question_controls.html:38 -msgid "undelete" +#: skins/common/templates/question/answer_controls.html:41 +#: skins/common/templates/question/question_controls.html:42 +#: skins/default/templates/macros.html:307 +#: skins/default/templates/revisions.html:38 +#: skins/default/templates/revisions.html:41 +msgid "edit" msgstr "" -#: skins/common/templates/question/answer_controls.html:40 -msgid "swap with question" +#: skins/common/templates/question/answer_vote_buttons.html:6 +#: skins/default/templates/user_profile/user_stats.html:24 +msgid "this answer has been selected as correct" msgstr "" -#: skins/common/templates/question/answer_vote_buttons.html:9 -#: skins/common/templates/question/answer_vote_buttons.html:10 +#: skins/common/templates/question/answer_vote_buttons.html:8 msgid "mark this answer as correct (click again to undo)" msgstr "" -#: skins/common/templates/question/answer_vote_buttons.html:12 -#: skins/common/templates/question/answer_vote_buttons.html:13 -#, python-format -msgid "%(question_author)s has selected this answer as correct" -msgstr "" - #: skins/common/templates/question/closed_question_info.html:2 #, python-format msgid "" -"The question has been closed for the following reason " -"<b>\"%(close_reason)s\"</b> <i>by" +"The question has been closed for the following reason <b>\"%(close_reason)s" +"\"</b> <i>by" msgstr "" #: skins/common/templates/question/closed_question_info.html:4 @@ -4098,19 +4221,19 @@ msgstr "" msgid "close date %(closed_at)s" msgstr "" -#: skins/common/templates/question/question_controls.html:6 -msgid "retag" -msgstr "" - -#: skins/common/templates/question/question_controls.html:13 +#: skins/common/templates/question/question_controls.html:12 msgid "reopen" msgstr "" -#: skins/common/templates/question/question_controls.html:17 +#: skins/common/templates/question/question_controls.html:14 #: skins/default/templates/user_profile/user_inbox.html:67 msgid "close" msgstr "" +#: skins/common/templates/question/question_controls.html:41 +msgid "retag" +msgstr "" + #: skins/common/templates/widgets/edit_post.html:21 msgid "one of these is required" msgstr "" @@ -4129,13 +4252,14 @@ msgstr "" #: skins/default/templates/ask.html:49 skins/default/templates/ask.html:52 #: skins/default/templates/question_edit.html:73 #: skins/default/templates/question_edit.html:76 -#: skins/default/templates/question/javascript.html:84 -#: skins/default/templates/question/javascript.html:87 +#: skins/default/templates/question/javascript.html:85 +#: skins/default/templates/question/javascript.html:88 msgid "hide preview" msgstr "" #: skins/common/templates/widgets/related_tags.html:3 -msgid "Related tags" +#: skins/default/templates/tags.html:4 +msgid "Tags" msgstr "" #: skins/common/templates/widgets/tag_selector.html:4 @@ -4259,13 +4383,16 @@ msgstr "" #: skins/default/templates/answer_edit.html:64 #: skins/default/templates/ask.html:52 #: skins/default/templates/question_edit.html:76 -#: skins/default/templates/question/javascript.html:87 +#: skins/default/templates/question/javascript.html:88 msgid "show preview" msgstr "" #: skins/default/templates/ask.html:4 -msgid "Ask a question" -msgstr "" +#: skins/default/templates/widgets/ask_button.html:5 +#: skins/default/templates/widgets/ask_form.html:43 +#, fuzzy +msgid "Ask Your Question" +msgstr "खुद के प्रश्नों को बंद करें" #: skins/default/templates/badge.html:5 skins/default/templates/badge.html:9 #: skins/default/templates/user_profile/user_recent.html:19 @@ -4296,11 +4423,7 @@ msgid_plural "users received this badge:" msgstr[0] "" msgstr[1] "" -#: skins/default/templates/badges.html:3 -msgid "Badges summary" -msgstr "" - -#: skins/default/templates/badges.html:5 +#: skins/default/templates/badges.html:3 skins/default/templates/badges.html:5 msgid "Badges" msgstr "" @@ -4312,38 +4435,41 @@ msgstr "" #, python-format msgid "" "Below is the list of available badges and number \n" -"of times each type of badge has been awarded. Give us feedback at %(feedback_faq_url)s.\n" +" of times each type of badge has been awarded. Have ideas about fun \n" +"badges? Please, give us your <a href='%%(feedback_faq_url)s'>feedback</a>\n" msgstr "" -#: skins/default/templates/badges.html:35 +#: skins/default/templates/badges.html:36 msgid "Community badges" msgstr "" -#: skins/default/templates/badges.html:37 +#: skins/default/templates/badges.html:38 msgid "gold badge: the highest honor and is very rare" msgstr "" -#: skins/default/templates/badges.html:40 -msgid "gold badge description" +#: skins/default/templates/badges.html:41 +msgid "" +"Gold badge is the highest award in this community. To obtain it have to " +"show \n" +"profound knowledge and ability in addition to your active participation." msgstr "" -#: skins/default/templates/badges.html:45 +#: skins/default/templates/badges.html:47 msgid "" "silver badge: occasionally awarded for the very high quality contributions" msgstr "" -#: skins/default/templates/badges.html:49 -msgid "silver badge description" +#: skins/default/templates/badges.html:51 +msgid "" +"msgid \"silver badge: occasionally awarded for the very high quality " +"contributions" msgstr "" -#: skins/default/templates/badges.html:52 +#: skins/default/templates/badges.html:54 +#: skins/default/templates/badges.html:58 msgid "bronze badge: often given as a special honor" msgstr "" -#: skins/default/templates/badges.html:56 -msgid "bronze badge description" -msgstr "" - #: skins/default/templates/close.html:3 skins/default/templates/close.html:5 msgid "Close question" msgstr "" @@ -4383,12 +4509,12 @@ msgstr "" #: skins/default/templates/faq_static.html:8 msgid "" -"Before asking the question - please make sure to use search to see whether " -"your question has alredy been answered." +"Before you ask - please make sure to search for a similar question. You can " +"search questions by their title or tags." msgstr "" #: skins/default/templates/faq_static.html:10 -msgid "What questions should I avoid asking?" +msgid "What kinds of questions should be avoided?" msgstr "" #: skins/default/templates/faq_static.html:11 @@ -4403,9 +4529,10 @@ msgstr "" #: skins/default/templates/faq_static.html:14 msgid "" -"is a Q&A site, not a discussion group. Therefore - please avoid having " -"discussions in your answers, comment facility allows some space for brief " -"discussions." +"is a <strong>question and answer</strong> site - <strong>it is not a " +"discussion group</strong>. Please avoid holding debates in your answers as " +"they tend to dilute the essense of questions and answers. For the brief " +"discussions please use commenting facility." msgstr "" #: skins/default/templates/faq_static.html:15 @@ -4422,16 +4549,20 @@ msgstr "" #: skins/default/templates/faq_static.html:18 msgid "" -"The reputation system allows users earn the authorization to perform a " -"variety of moderation tasks." +"Karma system allows users to earn rights to perform a variety of moderation " +"tasks" msgstr "" #: skins/default/templates/faq_static.html:20 -msgid "How does reputation system work?" +msgid "How does karma system work?" msgstr "" #: skins/default/templates/faq_static.html:21 -msgid "Rep system summary" +msgid "" +"When a question or answer is upvoted, the user who posted them will gain " +"some points, which are called \\\"karma points\\\". These points serve as a " +"rough measure of the community trust to him/her. Various moderation tasks " +"are gradually assigned to the users based on those points." msgstr "" #: skins/default/templates/faq_static.html:22 @@ -4439,13 +4570,12 @@ msgstr "" 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 " -"<strong>%(REP_GAIN_FOR_RECEIVING_UPVOTE)s</strong> points, each vote against" -" will subtract <strong>%(REP_LOSS_FOR_RECEIVING_DOWNVOTE)s</strong> points. " -"There is a limit of <strong>%(MAX_REP_GAIN_PER_USER_PER_DAY)s</strong> " -"points that can be accumulated for a question or answer per day. The table " -"below explains reputation point requirements for each type of moderation " -"task." +"it will be downvoted. Each vote in favor will generate <strong>" +"%(REP_GAIN_FOR_RECEIVING_UPVOTE)s</strong> points, each vote against will " +"subtract <strong>%(REP_LOSS_FOR_RECEIVING_DOWNVOTE)s</strong> points. There " +"is a limit of <strong>%(MAX_REP_GAIN_PER_USER_PER_DAY)s</strong> points that " +"can be accumulated for a question or answer per day. The table below " +"explains reputation point requirements for each type of moderation task." msgstr "" #: skins/default/templates/faq_static.html:32 @@ -4453,89 +4583,102 @@ msgstr "" msgid "upvote" msgstr "" -#: skins/default/templates/faq_static.html:42 +#: skins/default/templates/faq_static.html:36 msgid "add comments" msgstr "" -#: skins/default/templates/faq_static.html:46 +#: skins/default/templates/faq_static.html:40 #: skins/default/templates/user_profile/user_votes.html:15 msgid "downvote" msgstr "" -#: skins/default/templates/faq_static.html:49 +#: skins/default/templates/faq_static.html:43 msgid " accept own answer to own questions" msgstr "" -#: skins/default/templates/faq_static.html:53 +#: skins/default/templates/faq_static.html:47 msgid "open and close own questions" msgstr "" -#: skins/default/templates/faq_static.html:57 +#: skins/default/templates/faq_static.html:51 msgid "retag other's questions" msgstr "" -#: skins/default/templates/faq_static.html:62 +#: skins/default/templates/faq_static.html:56 msgid "edit community wiki questions" msgstr "" -#: skins/default/templates/faq_static.html:67 +#: skins/default/templates/faq_static.html:61 msgid "edit any answer" msgstr "" -#: skins/default/templates/faq_static.html:71 +#: skins/default/templates/faq_static.html:65 msgid "delete any comment" msgstr "" -#: skins/default/templates/faq_static.html:74 -msgid "what is gravatar" +#: skins/default/templates/faq_static.html:69 +msgid "How to change my picture (gravatar) and what is gravatar?" msgstr "" -#: skins/default/templates/faq_static.html:75 -msgid "gravatar faq info" +#: skins/default/templates/faq_static.html:70 +msgid "" +"<p>The picture that appears on the users profiles is called " +"<strong>gravatar</strong> (which means <strong>g</strong>lobally <strong>r</" +"strong>ecognized <strong>avatar</strong>).</p><p>Here is how it works: a " +"<strong>cryptographic key</strong> (unbreakable code) is calculated from " +"your email address. You upload your picture (or your favorite alter ego " +"image) the website <a href='http://gravatar.com'><strong>gravatar.com</" +"strong></a> from where we later retreive your image using the key.</" +"p><p>This way all the websites you trust can show your image next to your " +"posts and your email address remains private.</p><p>Please " +"<strong>personalize your account</strong> with an image - just register at " +"<a href='http://gravatar.com'><strong>gravatar.com</strong></a> (just please " +"be sure to use the same email address that you used to register with us). " +"Default image that looks like a kitchen tile is generated automatically.</p>" msgstr "" -#: skins/default/templates/faq_static.html:76 +#: skins/default/templates/faq_static.html:71 msgid "To register, do I need to create new password?" msgstr "" -#: skins/default/templates/faq_static.html:77 +#: skins/default/templates/faq_static.html:72 msgid "" "No, you don't have to. You can login through any service that supports " "OpenID, e.g. Google, Yahoo, AOL, etc.\"" msgstr "" -#: skins/default/templates/faq_static.html:78 +#: skins/default/templates/faq_static.html:73 msgid "\"Login now!\"" msgstr "" -#: skins/default/templates/faq_static.html:80 +#: skins/default/templates/faq_static.html:75 msgid "Why other people can edit my questions/answers?" msgstr "" -#: skins/default/templates/faq_static.html:81 +#: skins/default/templates/faq_static.html:76 msgid "Goal of this site is..." msgstr "" -#: skins/default/templates/faq_static.html:81 +#: skins/default/templates/faq_static.html:76 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 "" -#: skins/default/templates/faq_static.html:82 +#: skins/default/templates/faq_static.html:77 msgid "If this approach is not for you, we respect your choice." msgstr "" -#: skins/default/templates/faq_static.html:84 +#: skins/default/templates/faq_static.html:79 msgid "Still have questions?" msgstr "" -#: skins/default/templates/faq_static.html:85 +#: skins/default/templates/faq_static.html:80 #, python-format msgid "" -"Please ask your question at %(ask_question_url)s, help make our community " -"better!" +"Please <a href='%%(ask_question_url)s'>ask</a> your question, help make our " +"community better!" msgstr "" #: skins/default/templates/feedback.html:3 @@ -4550,7 +4693,8 @@ msgstr "" #, python-format msgid "" "\n" -" <span class='big strong'>Dear %(user_name)s</span>, we look forward to hearing your feedback. \n" +" <span class='big strong'>Dear %(user_name)s</span>, we look forward " +"to hearing your feedback. \n" " Please type and send us your message below.\n" " " msgstr "" @@ -4558,7 +4702,8 @@ msgstr "" #: skins/default/templates/feedback.html:21 msgid "" "\n" -" <span class='big strong'>Dear visitor</span>, we look forward to hearing your feedback.\n" +" <span class='big strong'>Dear visitor</span>, we look forward to " +"hearing your feedback.\n" " Please type and send us your message below.\n" " " msgstr "" @@ -4639,8 +4784,10 @@ msgstr "" #: skins/default/templates/help.html:29 msgid "" -"Besides, you can @mention users anywhere in the text to point their attention,\n" -" follow users and conversations and report inappropriate content by flagging it." +"Besides, you can @mention users anywhere in the text to point their " +"attention,\n" +" follow users and conversations and report inappropriate content by " +"flagging it." msgstr "" #: skins/default/templates/help.html:32 @@ -4673,7 +4820,8 @@ msgstr "" #: skins/default/templates/import_data.html:27 msgid "" "In the case you experience any difficulties in using this import tool,\n" -" please try importing your data via command line: <code>python manage.py load_stackexchange path/to/your-data.zip</code>" +" please try importing your data via command line: <code>python manage." +"py load_stackexchange path/to/your-data.zip</code>" msgstr "" #: skins/default/templates/instant_notification.html:1 @@ -4685,14 +4833,16 @@ msgstr "" #, python-format msgid "" "\n" -"<p>%(update_author_name)s left a <a href=\"%(post_url)s\">new comment</a>:</p>\n" +"<p>%(update_author_name)s left a <a href=\"%(post_url)s\">new comment</a>:</" +"p>\n" msgstr "" #: skins/default/templates/instant_notification.html:8 #, python-format msgid "" "\n" -"<p>%(update_author_name)s left a <a href=\"%(post_url)s\">new comment</a></p>\n" +"<p>%(update_author_name)s left a <a href=\"%(post_url)s\">new comment</a></" +"p>\n" msgstr "" #: skins/default/templates/instant_notification.html:13 @@ -4732,8 +4882,10 @@ msgstr "" msgid "" "\n" "<div>%(content_preview)s</div>\n" -"<p>Please note - you can easily <a href=\"%(user_subscriptions_url)s\">change</a>\n" -"how often you receive these notifications or unsubscribe. Thank you for your interest in our forum!</p>\n" +"<p>Please note - you can easily <a href=\"%(user_subscriptions_url)s" +"\">change</a>\n" +"how often you receive these notifications or unsubscribe. Thank you for your " +"interest in our forum!</p>\n" msgstr "" #: skins/default/templates/instant_notification.html:42 @@ -4746,169 +4898,132 @@ msgid "Share this question on %(site)s" msgstr "" #: skins/default/templates/macros.html:16 -#: skins/default/templates/macros.html:440 +#: skins/default/templates/macros.html:432 #, python-format msgid "follow %(alias)s" msgstr "" #: skins/default/templates/macros.html:19 -#: skins/default/templates/macros.html:443 +#: skins/default/templates/macros.html:435 #, python-format msgid "unfollow %(alias)s" msgstr "" #: skins/default/templates/macros.html:20 -#: skins/default/templates/macros.html:444 +#: skins/default/templates/macros.html:436 #, python-format msgid "following %(alias)s" msgstr "" -#: skins/default/templates/macros.html:31 -msgid "i like this question (click again to cancel)" -msgstr "" - #: skins/default/templates/macros.html:33 -msgid "i like this answer (click again to cancel)" -msgstr "" - -#: skins/default/templates/macros.html:39 msgid "current number of votes" msgstr "" -#: skins/default/templates/macros.html:45 -msgid "i dont like this question (click again to cancel)" -msgstr "" - -#: skins/default/templates/macros.html:47 -msgid "i dont like this answer (click again to cancel)" -msgstr "" - -#: skins/default/templates/macros.html:54 +#: skins/default/templates/macros.html:46 msgid "anonymous user" msgstr "" -#: skins/default/templates/macros.html:87 +#: skins/default/templates/macros.html:79 msgid "this post is marked as community wiki" msgstr "" -#: skins/default/templates/macros.html:90 +#: skins/default/templates/macros.html:82 #, python-format msgid "" "This post is a wiki.\n" " Anyone with karma >%(wiki_min_rep)s is welcome to improve it." msgstr "" -#: skins/default/templates/macros.html:96 +#: skins/default/templates/macros.html:88 msgid "asked" msgstr "" -#: skins/default/templates/macros.html:98 +#: skins/default/templates/macros.html:90 msgid "answered" msgstr "" -#: skins/default/templates/macros.html:100 +#: skins/default/templates/macros.html:92 msgid "posted" msgstr "" -#: skins/default/templates/macros.html:130 +#: skins/default/templates/macros.html:122 msgid "updated" msgstr "" -#: skins/default/templates/macros.html:206 +#: skins/default/templates/macros.html:198 #, python-format msgid "see questions tagged '%(tag)s'" msgstr "" -#: skins/default/templates/macros.html:258 -#: skins/default/templates/macros.html:266 -#: skins/default/templates/question/javascript.html:19 -msgid "add comment" -msgstr "" - -#: skins/default/templates/macros.html:259 -#, python-format -msgid "see <strong>%(counter)s</strong> more" -msgid_plural "see <strong>%(counter)s</strong> more" -msgstr[0] "" -msgstr[1] "" - -#: skins/default/templates/macros.html:261 -#, python-format -msgid "see <strong>%(counter)s</strong> more comment" -msgid_plural "" -"see <strong>%(counter)s</strong> more comments\n" -" " -msgstr[0] "" -msgstr[1] "" - -#: skins/default/templates/macros.html:305 +#: skins/default/templates/macros.html:300 msgid "delete this comment" msgstr "" -#: skins/default/templates/macros.html:511 templatetags/extra_tags.py:43 +#: skins/default/templates/macros.html:503 templatetags/extra_tags.py:43 #, python-format msgid "%(username)s gravatar image" msgstr "" -#: skins/default/templates/macros.html:520 +#: skins/default/templates/macros.html:512 #, python-format msgid "%(username)s's website is %(url)s" msgstr "" -#: skins/default/templates/macros.html:535 -#: skins/default/templates/macros.html:536 -#: skins/default/templates/macros.html:574 -#: skins/default/templates/macros.html:575 +#: skins/default/templates/macros.html:527 +#: skins/default/templates/macros.html:528 +#: skins/default/templates/macros.html:566 +#: skins/default/templates/macros.html:567 msgid "previous" msgstr "" -#: skins/default/templates/macros.html:547 -#: skins/default/templates/macros.html:586 +#: skins/default/templates/macros.html:539 +#: skins/default/templates/macros.html:578 msgid "current page" msgstr "" -#: skins/default/templates/macros.html:549 -#: skins/default/templates/macros.html:556 -#: skins/default/templates/macros.html:588 -#: skins/default/templates/macros.html:595 +#: skins/default/templates/macros.html:541 +#: skins/default/templates/macros.html:548 +#: skins/default/templates/macros.html:580 +#: skins/default/templates/macros.html:587 #, python-format -msgid "page number %(num)s" +msgid "page %(num)s" msgstr "" -#: skins/default/templates/macros.html:560 -#: skins/default/templates/macros.html:599 +#: skins/default/templates/macros.html:552 +#: skins/default/templates/macros.html:591 msgid "next page" msgstr "" -#: skins/default/templates/macros.html:611 +#: skins/default/templates/macros.html:603 +#, python-format msgid "responses for %(username)s" msgstr "" -#: skins/default/templates/macros.html:614 +#: skins/default/templates/macros.html:606 #, python-format -msgid "you have a new response" +msgid "you have %(response_count)s new response" msgid_plural "you have %(response_count)s new responses" msgstr[0] "" msgstr[1] "" -#: skins/default/templates/macros.html:617 +#: skins/default/templates/macros.html:609 msgid "no new responses yet" msgstr "" -#: skins/default/templates/macros.html:632 -#: skins/default/templates/macros.html:633 +#: skins/default/templates/macros.html:624 +#: skins/default/templates/macros.html:625 #, python-format msgid "%(new)s new flagged posts and %(seen)s previous" msgstr "" -#: skins/default/templates/macros.html:635 -#: skins/default/templates/macros.html:636 +#: skins/default/templates/macros.html:627 +#: skins/default/templates/macros.html:628 #, python-format msgid "%(new)s new flagged posts" msgstr "" -#: skins/default/templates/macros.html:641 -#: skins/default/templates/macros.html:642 +#: skins/default/templates/macros.html:633 +#: skins/default/templates/macros.html:634 #, python-format msgid "%(seen)s flagged posts" msgstr "" @@ -4917,6 +5032,20 @@ msgstr "" msgid "Questions" msgstr "" +#: skins/default/templates/question.html:98 +msgid "post a comment / <strong>some</strong> more" +msgstr "" + +#: skins/default/templates/question.html:101 +msgid "see <strong>some</strong> more" +msgstr "" + +#: skins/default/templates/question.html:105 +#: skins/default/templates/question/javascript.html:20 +#, fuzzy +msgid "post a comment" +msgstr "टिप्पणी छोड़ दे " + #: skins/default/templates/question_edit.html:4 #: skins/default/templates/question_edit.html:9 msgid "Edit question" @@ -4924,8 +5053,9 @@ msgstr "" #: skins/default/templates/question_retag.html:3 #: skins/default/templates/question_retag.html:5 -msgid "Change tags" -msgstr "" +#, fuzzy +msgid "Retag question" +msgstr "नवीनतम प्रश्नों" #: skins/default/templates/question_retag.html:21 msgid "Retag" @@ -5005,15 +5135,15 @@ msgstr "" msgid "Subscribe" msgstr "" -#: skins/default/templates/tags.html:4 skins/default/templates/tags.html:10 -msgid "Tag list" -msgstr "" - #: skins/default/templates/tags.html:8 #, python-format msgid "Tags, matching \"%(stag)s\"" msgstr "" +#: skins/default/templates/tags.html:10 +msgid "Tag list" +msgstr "" + #: skins/default/templates/tags.html:14 skins/default/templates/users.html:9 #: skins/default/templates/main_page/tab_bar.html:15 msgid "Sort by »" @@ -5049,7 +5179,9 @@ msgstr "" #: skins/default/templates/users.html:15 #: skins/default/templates/user_profile/user_info.html:25 -msgid "reputation" +#: skins/default/templates/user_profile/user_reputation.html:4 +#: skins/default/templates/user_profile/user_tabs.html:23 +msgid "karma" msgstr "" #: skins/default/templates/users.html:20 @@ -5081,7 +5213,7 @@ msgstr "" msgid "Nothing found." msgstr "" -#: skins/default/templates/main_page/headline.html:4 views/readers.py:136 +#: skins/default/templates/main_page/headline.html:4 views/readers.py:135 #, python-format msgid "%(q_num)s question" msgid_plural "%(q_num)s questions" @@ -5186,8 +5318,8 @@ msgstr "" #, python-format msgid "" "Please note: %(app_name)s requires javascript to work properly, please " -"enable javascript in your browser, <a href=\"%(noscript_url)s\">here is " -"how</a>" +"enable javascript in your browser, <a href=\"%(noscript_url)s\">here is how</" +"a>" msgstr "" #: skins/default/templates/meta/editor_data.html:5 @@ -5231,26 +5363,14 @@ msgstr "" msgid "oldest answers will be shown first" msgstr "" -#: skins/default/templates/question/answer_tab_bar.html:15 -msgid "oldest answers" -msgstr "" - #: skins/default/templates/question/answer_tab_bar.html:17 msgid "newest answers will be shown first" msgstr "" -#: skins/default/templates/question/answer_tab_bar.html:18 -msgid "newest answers" -msgstr "" - #: skins/default/templates/question/answer_tab_bar.html:20 msgid "most voted answers will be shown first" msgstr "" -#: skins/default/templates/question/answer_tab_bar.html:21 -msgid "popular answers" -msgstr "" - #: skins/default/templates/question/content.html:40 #: skins/default/templates/question/new_answer_form.html:48 msgid "Answer Your Own Question" @@ -5269,23 +5389,41 @@ msgid "Be the first one to answer this question!" msgstr "" #: skins/default/templates/question/new_answer_form.html:32 -msgid "you can answer anonymously and then login" +msgid "" +"<span class='strong big'>Please start posting your answer anonymously</span> " +"- your answer will be saved within the current session and published after " +"you log in or create a new account. Please try to give a <strong>substantial " +"answer</strong>, for discussions, <strong>please use comments</strong> and " +"<strong>please do remember to vote</strong> (after you log in)!" msgstr "" #: skins/default/templates/question/new_answer_form.html:36 -msgid "answer your own question only to give an answer" +msgid "" +"<span class='big strong'>You are welcome to answer your own question</span>, " +"but please make sure to give an <strong>answer</strong>. Remember that you " +"can always <strong>revise your original question</strong>. Please " +"<strong>use comments for discussions</strong> and <strong>please don't " +"forget to vote :)</strong> for the answers that you liked (or perhaps did " +"not like)!" msgstr "" #: skins/default/templates/question/new_answer_form.html:38 -msgid "please only give an answer, no discussions" +msgid "" +"<span class='big strong'>Please try to give a substantial answer</span>. If " +"you wanted to comment on the question or answer, just <strong>use the " +"commenting tool</strong>. Please remember that you can always <strong>revise " +"your answers</strong> - no need to answer the same question twice. Also, " +"please <strong>don't forget to vote</strong> - it really helps to select the " +"best questions and answers!" msgstr "" #: skins/default/templates/question/new_answer_form.html:45 -msgid "Login/Signup to Post Your Answer" +#: skins/default/templates/widgets/ask_form.html:41 +msgid "Login/Signup to Post" msgstr "" #: skins/default/templates/question/new_answer_form.html:50 -msgid "Answer the question" +msgid "Post Your Answer" msgstr "" #: skins/default/templates/question/sharing_prompt_phrase.html:2 @@ -5357,11 +5495,12 @@ msgid "Stats" msgstr "" #: skins/default/templates/question/sidebar.html:46 -msgid "question asked" -msgstr "" +#, fuzzy +msgid "Asked" +msgstr "मेरे द्वारा पूछा गया" #: skins/default/templates/question/sidebar.html:49 -msgid "question was seen" +msgid "Seen" msgstr "" #: skins/default/templates/question/sidebar.html:49 @@ -5369,34 +5508,25 @@ msgid "times" msgstr "" #: skins/default/templates/question/sidebar.html:52 -msgid "last updated" +msgid "Last updated" msgstr "" #: skins/default/templates/question/sidebar.html:60 msgid "Related questions" msgstr "" -#: skins/default/templates/question/subscribe_by_email_prompt.html:7 -#: skins/default/templates/question/subscribe_by_email_prompt.html:9 -msgid "Notify me once a day when there are any new answers" +#: skins/default/templates/question/subscribe_by_email_prompt.html:5 +msgid "Email me when there are any new answers" msgstr "" #: skins/default/templates/question/subscribe_by_email_prompt.html:11 -msgid "Notify me weekly when there are any new answers" -msgstr "" - -#: skins/default/templates/question/subscribe_by_email_prompt.html:13 -msgid "Notify me immediately when there are any new answers" +msgid "once you sign in you will be able to subscribe for any updates here" msgstr "" -#: skins/default/templates/question/subscribe_by_email_prompt.html:16 -#, python-format +#: skins/default/templates/question/subscribe_by_email_prompt.html:12 msgid "" -"You can always adjust frequency of email updates from your %(profile_url)s" -msgstr "" - -#: skins/default/templates/question/subscribe_by_email_prompt.html:21 -msgid "once you sign in you will be able to subscribe for any updates here" +"<span class='strong'>Here</span> (once you log in) you will be able to sign " +"up for the periodic email updates about this question." msgstr "" #: skins/default/templates/user_profile/user.html:12 @@ -5430,12 +5560,12 @@ msgstr "" msgid "Screen Name" msgstr "" -#: skins/default/templates/user_profile/user_edit.html:60 +#: skins/default/templates/user_profile/user_edit.html:59 msgid "(cannot be changed)" msgstr "" -#: skins/default/templates/user_profile/user_edit.html:102 -#: skins/default/templates/user_profile/user_email_subscriptions.html:21 +#: skins/default/templates/user_profile/user_edit.html:101 +#: skins/default/templates/user_profile/user_email_subscriptions.html:22 msgid "Update" msgstr "" @@ -5448,12 +5578,17 @@ msgstr "" msgid "Email subscription settings" msgstr "" -#: skins/default/templates/user_profile/user_email_subscriptions.html:8 -msgid "email subscription settings info" +#: skins/default/templates/user_profile/user_email_subscriptions.html:9 +msgid "" +"<span class='big strong'>Adjust frequency of email updates.</span> Receive " +"updates on interesting questions by email, <strong><br/>help the community</" +"strong> by answering questions of your colleagues. If you do not wish to " +"receive emails - select 'no email' on all items below.<br/>Updates are only " +"sent when there is any new activity on selected items." msgstr "" -#: skins/default/templates/user_profile/user_email_subscriptions.html:22 -msgid "Stop sending email" +#: skins/default/templates/user_profile/user_email_subscriptions.html:23 +msgid "Stop Email" msgstr "" #: skins/default/templates/user_profile/user_favorites.html:4 @@ -5533,7 +5668,7 @@ msgid "real name" msgstr "" #: skins/default/templates/user_profile/user_info.html:58 -msgid "member for" +msgid "member since" msgstr "" #: skins/default/templates/user_profile/user_info.html:63 @@ -5541,8 +5676,9 @@ msgid "last seen" msgstr "" #: skins/default/templates/user_profile/user_info.html:69 -msgid "user website" -msgstr "" +#, fuzzy +msgid "website" +msgstr "वेबसाइट" #: skins/default/templates/user_profile/user_info.html:75 msgid "location" @@ -5679,20 +5815,11 @@ msgstr "" msgid "%(username)s's network is empty" msgstr "" -#: skins/default/templates/user_profile/user_recent.html:4 -#: skins/default/templates/user_profile/user_tabs.html:31 -msgid "activity" -msgstr "" - #: skins/default/templates/user_profile/user_recent.html:24 #: skins/default/templates/user_profile/user_recent.html:28 msgid "source" msgstr "" -#: skins/default/templates/user_profile/user_reputation.html:4 -msgid "karma" -msgstr "" - #: skins/default/templates/user_profile/user_reputation.html:11 msgid "Your karma change log." msgstr "" @@ -5725,10 +5852,6 @@ msgstr[1] "" msgid "the answer has been voted for %(answer_score)s times" msgstr "" -#: skins/default/templates/user_profile/user_stats.html:24 -msgid "this answer has been selected as correct" -msgstr "" - #: skins/default/templates/user_profile/user_stats.html:34 #, python-format msgid "(%(comment_count)s comment)" @@ -5781,7 +5904,7 @@ msgstr "" msgid "User profile" msgstr "" -#: skins/default/templates/user_profile/user_tabs.html:10 views/users.py:630 +#: skins/default/templates/user_profile/user_tabs.html:10 views/users.py:638 msgid "comments and answers to others questions" msgstr "" @@ -5790,30 +5913,18 @@ msgid "followers and followed users" msgstr "" #: skins/default/templates/user_profile/user_tabs.html:21 -msgid "graph of user reputation" -msgstr "" - -#: skins/default/templates/user_profile/user_tabs.html:23 -msgid "reputation history" +msgid "Graph of user karma" msgstr "" #: skins/default/templates/user_profile/user_tabs.html:25 msgid "questions that user is following" msgstr "" -#: skins/default/templates/user_profile/user_tabs.html:29 -msgid "recent activity" -msgstr "" - -#: skins/default/templates/user_profile/user_tabs.html:34 views/users.py:671 +#: skins/default/templates/user_profile/user_tabs.html:34 views/users.py:679 msgid "user vote record" msgstr "" -#: skins/default/templates/user_profile/user_tabs.html:36 -msgid "casted votes" -msgstr "" - -#: skins/default/templates/user_profile/user_tabs.html:40 views/users.py:761 +#: skins/default/templates/user_profile/user_tabs.html:40 views/users.py:769 msgid "email subscription settings" msgstr "" @@ -5821,16 +5932,13 @@ msgstr "" msgid "moderate this user" msgstr "" -#: skins/default/templates/user_profile/user_votes.html:4 -msgid "votes" -msgstr "" - #: skins/default/templates/widgets/answer_edit_tips.html:3 -msgid "answer tips" +#: skins/default/templates/widgets/question_edit_tips.html:3 +msgid "Tips" msgstr "" #: skins/default/templates/widgets/answer_edit_tips.html:6 -msgid "please make your answer relevant to this community" +msgid "give an answer interesting to this community" msgstr "" #: skins/default/templates/widgets/answer_edit_tips.html:9 @@ -5838,7 +5946,8 @@ msgid "try to give an answer, rather than engage into a discussion" msgstr "" #: skins/default/templates/widgets/answer_edit_tips.html:12 -msgid "please try to provide details" +#: skins/default/templates/widgets/question_edit_tips.html:8 +msgid "provide enough details" msgstr "" #: skins/default/templates/widgets/answer_edit_tips.html:15 @@ -5853,7 +5962,7 @@ msgstr "" #: skins/default/templates/widgets/answer_edit_tips.html:27 #: skins/default/templates/widgets/question_edit_tips.html:22 -msgid "Markdown tips" +msgid "Markdown basics" msgstr "" #: skins/default/templates/widgets/answer_edit_tips.html:31 @@ -5877,11 +5986,6 @@ msgid "**bold** or __bold__" msgstr "" #: skins/default/templates/widgets/answer_edit_tips.html:45 -#: skins/default/templates/widgets/question_edit_tips.html:40 -msgid "link" -msgstr "" - -#: skins/default/templates/widgets/answer_edit_tips.html:45 #: skins/default/templates/widgets/answer_edit_tips.html:49 #: skins/default/templates/widgets/question_edit_tips.html:40 #: skins/default/templates/widgets/question_edit_tips.html:45 @@ -5908,28 +6012,28 @@ msgstr "" msgid "learn more about Markdown" msgstr "" -#: skins/default/templates/widgets/ask_button.html:5 -msgid "ask a question" -msgstr "" - #: skins/default/templates/widgets/ask_form.html:6 msgid "login to post question info" msgstr "" -#: skins/default/templates/widgets/ask_form.html:10 -#, python-format +#: skins/default/templates/widgets/ask_form.html:7 msgid "" -"must have valid %(email)s to post, \n" -" see %(email_validation_faq_url)s\n" -" " -msgstr "" - -#: skins/default/templates/widgets/ask_form.html:42 -msgid "Login/signup to post your question" +"<span class=\\\"strong big\\\">You are welcome to start submitting your " +"question anonymously</span>. When you submit the post, you will be " +"redirected to the login/signup page. Your question will be saved in the " +"current session and will be published after you log in. Login/signup process " +"is very simple. Login takes about 30 seconds, initial signup takes a minute " +"or less." msgstr "" -#: skins/default/templates/widgets/ask_form.html:44 -msgid "Ask your question" +#: skins/default/templates/widgets/ask_form.html:11 +#, python-format +msgid "" +"<span class='strong big'>Looks like your email address, %%(email)s has not " +"yet been validated.</span> To post messages you must verify your email, " +"please see <a href='%%(email_validation_faq_url)s'>more details here</a>." +"<br>You can submit your question now and validate email after that. Your " +"question will saved as pending meanwhile." msgstr "" #: skins/default/templates/widgets/contributors.html:3 @@ -5975,16 +6079,8 @@ msgstr "" msgid "badges" msgstr "" -#: skins/default/templates/widgets/question_edit_tips.html:3 -msgid "question tips" -msgstr "" - #: skins/default/templates/widgets/question_edit_tips.html:5 -msgid "please ask a relevant question" -msgstr "" - -#: skins/default/templates/widgets/question_edit_tips.html:8 -msgid "please try provide enough details" +msgid "ask a question interesting to this community" msgstr "" #: skins/default/templates/widgets/question_summary.html:12 @@ -6038,11 +6134,11 @@ msgid "badges:" msgstr "" #: skins/default/templates/widgets/user_navigation.html:9 -msgid "logout" +msgid "sign out" msgstr "" #: skins/default/templates/widgets/user_navigation.html:12 -msgid "login" +msgid "Hi, there! Please sign in" msgstr "" #: skins/default/templates/widgets/user_navigation.html:15 @@ -6050,7 +6146,7 @@ msgid "settings" msgstr "" #: templatetags/extra_filters_jinja.py:279 -msgid "no items in counter" +msgid "no" msgstr "" #: utils/decorators.py:90 views/commands.py:73 views/commands.py:93 @@ -6070,8 +6166,9 @@ msgid "this field is required" msgstr "" #: utils/forms.py:60 -msgid "choose a username" -msgstr "" +#, fuzzy +msgid "Choose a screen name" +msgstr "स्क्रीन नाम" #: utils/forms.py:69 msgid "user name is required" @@ -6102,7 +6199,7 @@ msgid "please use at least some alphabetic characters in the user name" msgstr "" #: utils/forms.py:138 -msgid "your email address" +msgid "Your email <i>(never shared)</i>" msgstr "" #: utils/forms.py:139 @@ -6117,16 +6214,12 @@ msgstr "" msgid "this email is already used by someone else, please choose another" msgstr "" -#: utils/forms.py:169 -msgid "choose password" -msgstr "" - #: utils/forms.py:170 msgid "password is required" msgstr "" #: utils/forms.py:173 -msgid "retype password" +msgid "Password <i>(please retype)</i>" msgstr "" #: utils/forms.py:174 @@ -6175,50 +6268,57 @@ msgstr "" msgid "Sorry, but anonymous users cannot access the inbox" msgstr "" -#: views/commands.py:111 -msgid "anonymous users cannot vote" -msgstr "" +#: views/commands.py:112 +#, fuzzy +msgid "Sorry, anonymous users cannot vote" +msgstr "क्षमा करें, लेकिन अज्ञात आगंतुकों इस फ़ंक्शन का उपयोग नहीं कर सकते हैं" -#: views/commands.py:127 +#: views/commands.py:129 msgid "Sorry you ran out of votes for today" msgstr "" -#: views/commands.py:133 +#: views/commands.py:135 #, python-format msgid "You have %(votes_left)s votes left for today" msgstr "" -#: views/commands.py:208 +#: views/commands.py:210 msgid "Sorry, something is not right here..." msgstr "" -#: views/commands.py:227 +#: views/commands.py:229 msgid "Sorry, but anonymous users cannot accept answers" msgstr "" -#: views/commands.py:336 +#: views/commands.py:339 #, python-format -msgid "subscription saved, %(email)s needs validation, see %(details_url)s" +msgid "" +"Your subscription is saved, but email address %(email)s needs to be " +"validated, please see <a href=\"%(details_url)s\">more details here</a>" msgstr "" -#: views/commands.py:343 +#: views/commands.py:348 msgid "email update frequency has been set to daily" msgstr "" -#: views/commands.py:449 +#: views/commands.py:461 #, python-format msgid "Tag subscription was canceled (<a href=\"%(url)s\">undo</a>)." msgstr "" -#: views/commands.py:458 +#: views/commands.py:470 #, python-format msgid "Please sign in to subscribe for: %(tags)s" msgstr "" -#: views/commands.py:584 +#: views/commands.py:596 msgid "Please sign in to vote" msgstr "" +#: views/commands.py:616 +msgid "Please sign in to delete/restore posts" +msgstr "" + #: views/meta.py:37 #, python-format msgid "About %(site)s" @@ -6240,14 +6340,14 @@ msgstr "" msgid "Privacy policy" msgstr "" -#: views/readers.py:134 +#: views/readers.py:133 #, python-format msgid "%(q_num)s question, tagged" msgid_plural "%(q_num)s questions, tagged" msgstr[0] "" msgstr[1] "" -#: views/readers.py:366 +#: views/readers.py:387 msgid "" "Sorry, the comment you are looking for has been deleted and is no longer " "accessible" @@ -6257,55 +6357,55 @@ msgstr "" msgid "moderate user" msgstr "" -#: views/users.py:373 +#: views/users.py:381 msgid "user profile" msgstr "" -#: views/users.py:374 +#: views/users.py:382 msgid "user profile overview" msgstr "" -#: views/users.py:543 +#: views/users.py:551 msgid "recent user activity" msgstr "" -#: views/users.py:544 +#: views/users.py:552 msgid "profile - recent activity" msgstr "" -#: views/users.py:631 +#: views/users.py:639 msgid "profile - responses" msgstr "" -#: views/users.py:672 +#: views/users.py:680 msgid "profile - votes" msgstr "" -#: views/users.py:693 -msgid "user reputation in the community" +#: views/users.py:701 +msgid "user karma" msgstr "" -#: views/users.py:694 -msgid "profile - user reputation" +#: views/users.py:702 +msgid "Profile - User's Karma" msgstr "" -#: views/users.py:712 +#: views/users.py:720 msgid "users favorite questions" msgstr "" -#: views/users.py:713 +#: views/users.py:721 msgid "profile - favorite questions" msgstr "" -#: views/users.py:733 views/users.py:737 +#: views/users.py:741 views/users.py:745 msgid "changes saved" msgstr "" -#: views/users.py:743 +#: views/users.py:751 msgid "email updates canceled" msgstr "" -#: views/users.py:762 +#: views/users.py:770 msgid "profile - email subscriptions" msgstr "" @@ -6324,67 +6424,82 @@ msgid "maximum upload file size is %(file_size)sK" msgstr "" #: views/writers.py:98 -msgid "" -"Error uploading file. Please contact the site administrator. Thank you." +msgid "Error uploading file. Please contact the site administrator. Thank you." msgstr "" -#: views/writers.py:204 -msgid "Please log in to ask questions" +#: views/writers.py:205 +msgid "" +"<span class=\"strong big\">You are welcome to start submitting your question " +"anonymously</span>. When you submit the post, you will be redirected to the " +"login/signup page. Your question will be saved in the current session and " +"will be published after you log in. Login/signup process is very simple. " +"Login takes about 30 seconds, initial signup takes a minute or less." msgstr "" -#: views/writers.py:469 +#: views/writers.py:482 msgid "Please log in to answer questions" msgstr "" -#: views/writers.py:575 +#: views/writers.py:588 #, python-format msgid "" -"Sorry, you appear to be logged out and cannot post comments. Please <a " -"href=\"%(sign_in_url)s\">sign in</a>." +"Sorry, you appear to be logged out and cannot post comments. Please <a href=" +"\"%(sign_in_url)s\">sign in</a>." msgstr "" -#: views/writers.py:592 +#: views/writers.py:605 msgid "Sorry, anonymous users cannot edit comments" msgstr "" -#: views/writers.py:622 +#: views/writers.py:635 #, python-format msgid "" "Sorry, you appear to be logged out and cannot delete comments. Please <a " "href=\"%(sign_in_url)s\">sign in</a>." msgstr "" -#: views/writers.py:642 +#: views/writers.py:656 msgid "sorry, we seem to have some technical difficulties" msgstr "" +#~ msgid "use-these-chars-in-tags" +#~ msgstr " टैग-में-इन-अक्षरों-का-उपयोग-करें" + +#~ msgid "URL for the LDAP service" +#~ msgstr "LDAP सेवा के लिए यूआरएल" + +#~ msgid "Explain how to change LDAP password" +#~ msgstr "व्याख्या कीजिये LDAP कूटशब्द को परिवर्तित कैसे करे " + #~ msgid "" -#~ "As a registered user you can login with your OpenID, log out of the site or " -#~ "permanently remove your account." +#~ "As a registered user you can login with your OpenID, log out of the site " +#~ "or permanently remove your account." #~ msgstr "" #~ "Clicking <strong>Logout</strong> will log you out from the forum but will " #~ "not sign you off from your OpenID provider.</p><p>If you wish to sign off " -#~ "completely - please make sure to log out from your OpenID provider as well." +#~ "completely - please make sure to log out from your OpenID provider as " +#~ "well." #~ msgid "Email verification subject line" #~ msgstr "Verification Email from Q&A forum" #~ msgid "" -#~ "how to validate email info with %(send_email_key_url)s %(gravatar_faq_url)s" +#~ "how to validate email info with %(send_email_key_url)s %(gravatar_faq_url)" +#~ "s" #~ msgstr "" -#~ "<form style='margin:0;padding:0;' action='%(send_email_key_url)s'><p><span " -#~ "class=\"bigger strong\">How?</span> If you have just set or changed your " -#~ "email address - <strong>check your email and click the included " -#~ "link</strong>.<br>The link contains a key generated specifically for you. " -#~ "You can also <button style='display:inline' type='submit'><strong>get a new " -#~ "key</strong></button> and check your email again.</p></form><span " -#~ "class=\"bigger strong\">Why?</span> Email validation is required to make " -#~ "sure that <strong>only you can post messages</strong> on your behalf and to " -#~ "<strong>minimize spam</strong> posts.<br>With email you can " -#~ "<strong>subscribe for updates</strong> on the most interesting questions. " -#~ "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>" +#~ "<form style='margin:0;padding:0;' action='%(send_email_key_url)" +#~ "s'><p><span class=\"bigger strong\">How?</span> If you have just set or " +#~ "changed your email address - <strong>check your email and click the " +#~ "included link</strong>.<br>The link contains a key generated specifically " +#~ "for you. You can also <button style='display:inline' " +#~ "type='submit'><strong>get a new key</strong></button> and check your " +#~ "email again.</p></form><span class=\"bigger strong\">Why?</span> Email " +#~ "validation is required to make sure that <strong>only you can post " +#~ "messages</strong> on your behalf and to <strong>minimize spam</strong> " +#~ "posts.<br>With email you can <strong>subscribe for updates</strong> on " +#~ "the most interesting questions. 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>" #~ msgid "reputation points" #~ msgstr "karma" diff --git a/askbot/locale/ru/LC_MESSAGES/django.po b/askbot/locale/ru/LC_MESSAGES/django.po index 4cb6dc25..cce3e594 100644 --- a/askbot/locale/ru/LC_MESSAGES/django.po +++ b/askbot/locale/ru/LC_MESSAGES/django.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: askbot\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-11 22:10-0500\n" +"POT-Creation-Date: 2012-03-11 22:42-0500\n" "PO-Revision-Date: 2012-03-09 09:49+0000\n" "Last-Translator: olloff <olloff@gmail.com>\n" "Language-Team: Russian (http://www.transifex.net/projects/p/askbot/language/" @@ -823,15 +823,15 @@ msgstr "" msgid "Enable recaptcha (keys below are required)" msgstr "Активировать recaptcha (требуется регистрация на recaptcha.net)" -#: conf/external_keys.py:60 +#: conf/external_keys.py:62 msgid "Recaptcha public key" msgstr "Публичный ключ для recaptcha" -#: conf/external_keys.py:68 +#: conf/external_keys.py:70 msgid "Recaptcha private key" msgstr "Секретный ключ для recaptcha" -#: conf/external_keys.py:70 +#: conf/external_keys.py:72 #, python-format msgid "" "Recaptcha is a tool that helps distinguish real people from annoying spam " @@ -842,11 +842,11 @@ msgstr "" "назойливых спам-ботов. Пожалуйста, получите и опубликуйте ключ на <a href=" "\"%(url)s\">%(url)s</a>" -#: conf/external_keys.py:82 +#: conf/external_keys.py:84 msgid "Facebook public API key" msgstr "Публичный ключ для доступа Facebook API" -#: conf/external_keys.py:84 +#: conf/external_keys.py:86 #, python-format msgid "" "Facebook API key and Facebook secret allow to use Facebook Connect login " @@ -857,15 +857,15 @@ msgstr "" "Connect для входа на Ваш сайт. Пожалуйста, получите эти ключи на <a href=" "\"%(url)s\">странице создания приложений Facebook</a> site" -#: conf/external_keys.py:97 +#: conf/external_keys.py:99 msgid "Facebook secret key" msgstr "Секретный ключ для Facebook" -#: conf/external_keys.py:105 +#: conf/external_keys.py:107 msgid "Twitter consumer key" msgstr "Публичный ключ для доступа Twitter API (consumer key)" -#: conf/external_keys.py:107 +#: conf/external_keys.py:109 #, python-format msgid "" "Please register your forum at <a href=\"%(url)s\">twitter applications site</" @@ -874,15 +874,15 @@ msgstr "" "Пожалуйста, зарегистрируйте свой форум на <a href=\"%(url)s\">странице " "приложений Twitter</a>" -#: conf/external_keys.py:118 +#: conf/external_keys.py:120 msgid "Twitter consumer secret" msgstr "Секретный ключ для доступа Twitter API (consumer secret)" -#: conf/external_keys.py:126 +#: conf/external_keys.py:128 msgid "LinkedIn consumer key" msgstr "Публичный ключ для LinkedIn (consumer key)" -#: conf/external_keys.py:128 +#: conf/external_keys.py:130 #, python-format msgid "" "Please register your forum at <a href=\"%(url)s\">LinkedIn developer site</a>" @@ -890,15 +890,15 @@ msgstr "" "Пожалуйста, зарегистрируйте свой форум на <a href=\"%(url)s\">странице " "разработчиков LinkedIn</a>" -#: conf/external_keys.py:139 +#: conf/external_keys.py:141 msgid "LinkedIn consumer secret" msgstr "Секретный ключ для LinkedIn (consumer secret)" -#: conf/external_keys.py:147 +#: conf/external_keys.py:149 msgid "ident.ca consumer key" msgstr "Ключ пользователя ident.ca" -#: conf/external_keys.py:149 +#: conf/external_keys.py:151 #, python-format msgid "" "Please register your forum at <a href=\"%(url)s\">Identi.ca applications " @@ -907,27 +907,10 @@ msgstr "" "Пожалуйста, зарегистрируйте свой форум на <a href=\"%(url)s\">странице " "приложений Identi.ca</a>" -#: conf/external_keys.py:160 +#: conf/external_keys.py:162 msgid "ident.ca consumer secret" msgstr "Секретный ключ ident.ca" -#: conf/external_keys.py:168 -msgid "Use LDAP authentication for the password login" -msgstr "" -"Использовать протокол LDAP для авторизации через пароль и имя пользователя" - -#: conf/external_keys.py:177 -msgid "LDAP service provider name" -msgstr "Имя провайдера сервиса авторизации LDAP" - -#: conf/external_keys.py:185 -msgid "URL for the LDAP service" -msgstr "URL, по которому доступен сервис LDAP" - -#: conf/external_keys.py:193 -msgid "Explain how to change LDAP password" -msgstr "Объясните, как изменить LDAP пароль" - #: conf/flatpages.py:11 msgid "Flatpages - about, privacy policy, etc." msgstr "Простые страницы - \"о нас\", \"политика о личных данных\" и.т.д." @@ -1165,6 +1148,41 @@ msgstr "Количество вопросов отображаемых на гл msgid "What should \"unanswered question\" mean?" msgstr "Что должен означать \"неотвеченный вопрос\"?" +#: conf/ldap.py:9 +msgid "LDAP login configuration" +msgstr "" + +#: conf/ldap.py:17 +msgid "Use LDAP authentication for the password login" +msgstr "" +"Использовать протокол LDAP для авторизации через пароль и имя пользователя" + +#: conf/ldap.py:26 +msgid "LDAP URL" +msgstr "" + +#: conf/ldap.py:35 +msgid "LDAP BASE DN" +msgstr "" + +#: conf/ldap.py:43 +msgid "LDAP Search Scope" +msgstr "" + +#: conf/ldap.py:52 +#, fuzzy +msgid "LDAP Server USERID field name" +msgstr "Имя провайдера сервиса авторизации LDAP" + +#: conf/ldap.py:61 +msgid "LDAP Server \"Common Name\" field name" +msgstr "" + +#: conf/ldap.py:70 +#, fuzzy +msgid "LDAP Server EMAIL field name" +msgstr "Имя провайдера сервиса авторизации LDAP" + #: conf/leading_sidebar.py:12 msgid "Common left sidebar" msgstr "Общая левая боковая панель" @@ -1691,29 +1709,29 @@ msgstr "Описание сайта для поисковиков" msgid "Short name for your Q&A forum" msgstr "Краткое название форума" -#: conf/site_settings.py:68 +#: conf/site_settings.py:67 msgid "Base URL for your Q&A forum, must start with http or https" msgstr "Базовая часть URL форума (должна начинаться с http или https)" -#: conf/site_settings.py:79 +#: conf/site_settings.py:78 msgid "Check to enable greeting for anonymous user" msgstr "Включить приветствие для анонимных пользователей" -#: conf/site_settings.py:90 +#: conf/site_settings.py:89 msgid "Text shown in the greeting message shown to the anonymous user" msgstr "" "Текст, который показывается в приветственном сообщении для анонимного " "пользователя" -#: conf/site_settings.py:94 +#: conf/site_settings.py:93 msgid "Use HTML to format the message " msgstr "Использовать HTML для форматирования сообщения" -#: conf/site_settings.py:103 +#: conf/site_settings.py:102 msgid "Feedback site URL" msgstr "Ссылка на сайт для обратной связи" -#: conf/site_settings.py:105 +#: conf/site_settings.py:104 msgid "If left empty, a simple internal feedback form will be used instead" msgstr "" "Если оставите это поле пустым, то для посылки обратной связи будет " @@ -2638,7 +2656,7 @@ msgid "" "Please contact the forum administrator to reach a resolution." msgstr "" -#: deps/django_authopenid/backends.py:88 +#: deps/django_authopenid/backends.py:166 msgid "" "Welcome! Please set email address (important!) in your profile and adjust " "screen name, if necessary." @@ -2828,8 +2846,8 @@ msgstr "Заходите через Ваш аккаунт на %(provider)s" msgid "OpenID %(openid_url)s is invalid" msgstr "OpenID %(openid_url)s недействителен" -#: deps/django_authopenid/views.py:261 deps/django_authopenid/views.py:412 -#: deps/django_authopenid/views.py:440 +#: deps/django_authopenid/views.py:261 deps/django_authopenid/views.py:408 +#: deps/django_authopenid/views.py:436 #, python-format msgid "" "Unfortunately, there was some problem when connecting to %(provider)s, " @@ -2838,68 +2856,68 @@ msgstr "" "К сожалению, возникла проблема при соединении с %(provider)s, пожалуйста " "попробуйте ещё раз или зайдите через другого провайдера" -#: deps/django_authopenid/views.py:362 +#: deps/django_authopenid/views.py:358 msgid "Your new password saved" msgstr "Ваш новый пароль сохранен" -#: deps/django_authopenid/views.py:466 +#: deps/django_authopenid/views.py:462 msgid "The login password combination was not correct" msgstr "Комбинация имени пользователя и пароля была неверной" -#: deps/django_authopenid/views.py:568 +#: deps/django_authopenid/views.py:564 msgid "Please click any of the icons below to sign in" msgstr "Введите имя пользователя и пароль" -#: deps/django_authopenid/views.py:570 +#: deps/django_authopenid/views.py:566 msgid "Account recovery email sent" msgstr "Email для восстановления аккаунта выслан" -#: deps/django_authopenid/views.py:573 +#: deps/django_authopenid/views.py:569 msgid "Please add one or more login methods." msgstr "" "Пожалуйста, добавьте хотя бы один постоянный метод для авторизации. Иметь " "два или больше методов тоже можно." -#: deps/django_authopenid/views.py:575 +#: deps/django_authopenid/views.py:571 msgid "If you wish, please add, remove or re-validate your login methods" msgstr "Здесь можно изменить пароль и проверить текущие методы авторизации" -#: deps/django_authopenid/views.py:577 +#: deps/django_authopenid/views.py:573 msgid "Please wait a second! Your account is recovered, but ..." msgstr "" "Пожалуйста, подождите секунду! Ваша учетная запись восстанавлена, но ..." -#: deps/django_authopenid/views.py:579 +#: deps/django_authopenid/views.py:575 msgid "Sorry, this account recovery key has expired or is invalid" msgstr "К сожалению, этот ключ восстановления истек или не является верным" -#: deps/django_authopenid/views.py:652 +#: deps/django_authopenid/views.py:648 #, python-format msgid "Login method %(provider_name)s does not exist" msgstr "Метод входа %(provider_name) s не существует" -#: deps/django_authopenid/views.py:658 +#: deps/django_authopenid/views.py:654 msgid "Oops, sorry - there was some error - please try again" msgstr "Упс, извините, произошла ошибка - пожалуйста, попробуйте ещё раз" -#: deps/django_authopenid/views.py:749 +#: deps/django_authopenid/views.py:745 #, python-format msgid "Your %(provider)s login works fine" msgstr "Вход при помощи %(provider)s работает отлично" -#: deps/django_authopenid/views.py:1060 deps/django_authopenid/views.py:1066 +#: deps/django_authopenid/views.py:1056 deps/django_authopenid/views.py:1062 #, python-format msgid "your email needs to be validated see %(details_url)s" msgstr "" "пожалуйста подтвердите ваш email, дополнительная информация (<a href=" "\"%(details_url)s\">здесь</a>)" -#: deps/django_authopenid/views.py:1087 +#: deps/django_authopenid/views.py:1083 #, python-format msgid "Recover your %(site)s account" msgstr "Восстановить аккаунт на сайте %(site)s" -#: deps/django_authopenid/views.py:1159 +#: deps/django_authopenid/views.py:1155 msgid "Please check your email and visit the enclosed link." msgstr "Пожалуйста, проверьте свой email и пройдите по вложенной ссылке." @@ -3005,21 +3023,6 @@ msgstr "Развернуть все" msgid "Congratulations, you are now an Administrator" msgstr "Поздравляем, теперь Вы администратор на нашем форуме" -#: management/commands/initialize_ldap_logins.py:51 -msgid "" -"This command may help you migrate to LDAP password authentication by " -"creating a record for LDAP association with each user account. There is an " -"assumption that ldap user id's are the same as user names registered at the " -"site. Before running this command it is necessary to set up LDAP parameters " -"in the \"External keys\" section of the site settings." -msgstr "" -"Эта команда может помочь вам мигрировать на механизм аутентификации по LDAP, " -"создавая запись для LDAP-ассоциаций для каждой пользовательской учетной " -"записи. При этом предполагается, что LDAP использует ID пользователей " -"идентичные именам пользователей на сайте, До использования этой команды, " -"необходимо установить параметры LDAP в разделе \"External keys\" настроек " -"сайта." - #: management/commands/post_emailed_questions.py:35 msgid "" "<p>To ask by email, please:</p>\n" @@ -3932,12 +3935,12 @@ msgstr "\" и \"%s\"" msgid "\" and more" msgstr "\" и более" -#: models/repute.py:141 +#: models/repute.py:143 #, python-format msgid "<em>Changed by moderator. Reason:</em> %(reason)s" msgstr "<em>Изменено модератором. Причина:</em> %(reason)s" -#: models/repute.py:152 +#: models/repute.py:154 #, python-format msgid "" "%(points)s points were added for %(username)s's contribution to question " @@ -3945,7 +3948,7 @@ msgid "" msgstr "" "%(points)s было добавлено за вклад %(username)s к вопросу %(question_title)s" -#: models/repute.py:157 +#: models/repute.py:159 #, python-format msgid "" "%(points)s points were subtracted for %(username)s's contribution to " @@ -4064,7 +4067,7 @@ msgstr "Сохранить Email" #: skins/default/templates/question_retag.html:22 #: skins/default/templates/reopen.html:27 #: skins/default/templates/subscribe_for_tags.html:16 -#: skins/default/templates/user_profile/user_edit.html:103 +#: skins/default/templates/user_profile/user_edit.html:102 msgid "Cancel" msgstr "Отменить" @@ -5456,9 +5459,9 @@ msgstr "ответы пользователю %(username)s" #: skins/default/templates/macros.html:606 #, python-format -msgid "you have a new response" +msgid "you have %(response_count)s new response" msgid_plural "you have %(response_count)s new responses" -msgstr[0] "вы получили новый ответ" +msgstr[0] "вы получили %(response_count)s новый ответ" msgstr[1] "вы получили %(response_count)s новых ответа" msgstr[2] "вы получили %(response_count)s новых ответов" @@ -6055,11 +6058,11 @@ msgstr "Зарегистрированный пользователь" msgid "Screen Name" msgstr "Отображаемое имя" -#: skins/default/templates/user_profile/user_edit.html:60 +#: skins/default/templates/user_profile/user_edit.html:59 msgid "(cannot be changed)" msgstr "(не может быть изменено)" -#: skins/default/templates/user_profile/user_edit.html:102 +#: skins/default/templates/user_profile/user_edit.html:101 #: skins/default/templates/user_profile/user_email_subscriptions.html:22 msgid "Update" msgstr "Обновить" @@ -6425,7 +6428,7 @@ msgstr "Ответить:" msgid "User profile" msgstr "Профиль пользователя" -#: skins/default/templates/user_profile/user_tabs.html:10 views/users.py:630 +#: skins/default/templates/user_profile/user_tabs.html:10 views/users.py:638 msgid "comments and answers to others questions" msgstr "комментарии и ответы на другие вопросы" @@ -6442,11 +6445,11 @@ msgstr "график репутации пользователя" msgid "questions that user is following" msgstr "вопросы отслеживаемые пользователем" -#: skins/default/templates/user_profile/user_tabs.html:34 views/users.py:671 +#: skins/default/templates/user_profile/user_tabs.html:34 views/users.py:679 msgid "user vote record" msgstr "голос пользователя" -#: skins/default/templates/user_profile/user_tabs.html:40 views/users.py:761 +#: skins/default/templates/user_profile/user_tabs.html:40 views/users.py:769 msgid "email subscription settings" msgstr "настройки подписки по электронной почте" @@ -6886,7 +6889,7 @@ msgid "Privacy policy" msgstr "Политика конфиденциальности" #: views/readers.py:133 -#, python-format +#, fuzzy, python-format msgid "%(q_num)s question, tagged" msgid_plural "%(q_num)s questions, tagged" msgstr[0] "Спросил" @@ -6903,57 +6906,57 @@ msgstr "Извините, но запрашиваемый комментарий msgid "moderate user" msgstr "модерировать пользователя" -#: views/users.py:373 +#: views/users.py:381 msgid "user profile" msgstr "профиль пользователя" -#: views/users.py:374 +#: views/users.py:382 msgid "user profile overview" msgstr "обзор профиля пользователя" -#: views/users.py:543 +#: views/users.py:551 msgid "recent user activity" msgstr "последние данные по активности пользователя" -#: views/users.py:544 +#: views/users.py:552 msgid "profile - recent activity" msgstr "профиль - последние данные по активности" -#: views/users.py:631 +#: views/users.py:639 msgid "profile - responses" msgstr "профиль - ответы" -#: views/users.py:672 +#: views/users.py:680 msgid "profile - votes" msgstr "профиль - голоса" -#: views/users.py:693 +#: views/users.py:701 #, fuzzy msgid "user karma" msgstr "Карма" -#: views/users.py:694 +#: views/users.py:702 #, fuzzy msgid "Profile - User's Karma" msgstr "профиль - карма пользователя" -#: views/users.py:712 +#: views/users.py:720 msgid "users favorite questions" msgstr "избранные вопросы пользователей" -#: views/users.py:713 +#: views/users.py:721 msgid "profile - favorite questions" msgstr "профиль - избранные вопросы" -#: views/users.py:733 views/users.py:737 +#: views/users.py:741 views/users.py:745 msgid "changes saved" msgstr "изменения сохранены" -#: views/users.py:743 +#: views/users.py:751 msgid "email updates canceled" msgstr "обновления по email отменены" -#: views/users.py:762 +#: views/users.py:770 msgid "profile - email subscriptions" msgstr "профиль - подписки" @@ -7021,6 +7024,26 @@ msgstr "" msgid "sorry, we seem to have some technical difficulties" msgstr "Извините, у нас определённые технические проблемы." +#~ msgid "URL for the LDAP service" +#~ msgstr "URL, по которому доступен сервис LDAP" + +#~ msgid "Explain how to change LDAP password" +#~ msgstr "Объясните, как изменить LDAP пароль" + +#~ msgid "" +#~ "This command may help you migrate to LDAP password authentication by " +#~ "creating a record for LDAP association with each user account. There is " +#~ "an assumption that ldap user id's are the same as user names registered " +#~ "at the site. Before running this command it is necessary to set up LDAP " +#~ "parameters in the \"External keys\" section of the site settings." +#~ msgstr "" +#~ "Эта команда может помочь вам мигрировать на механизм аутентификации по " +#~ "LDAP, создавая запись для LDAP-ассоциаций для каждой пользовательской " +#~ "учетной записи. При этом предполагается, что LDAP использует ID " +#~ "пользователей идентичные именам пользователей на сайте, До использования " +#~ "этой команды, необходимо установить параметры LDAP в разделе \"External " +#~ "keys\" настроек сайта." + #~ msgid "use-these-chars-in-tags" #~ msgstr "используйте только буквы и символ дефис \"-\"" @@ -7133,10 +7156,9 @@ msgstr "Извините, у нас определённые техническ #~ "</span> Правильный email нужен на этом форуме Вопросов и Ответов. Если " #~ "вы хотите, вы можете <strong>получать обновления</strong> интересных " #~ "вопросов или всего форума через email. Также, ваш email используется для " -#~ "того чтобы создать уникальный <a " -#~ "href='%(gravatar_faq_url)s'><strong>аватар</strong></a>, картинку для " -#~ "вашей учётной записи. Email никогда не показывается другим пользователям " -#~ "или ещё кому-то другому." +#~ "того чтобы создать уникальный <a href='%(gravatar_faq_url)" +#~ "s'><strong>аватар</strong></a>, картинку для вашей учётной записи. Email " +#~ "никогда не показывается другим пользователям или ещё кому-то другому." #~ msgid "Your new Email" #~ msgstr "" @@ -7150,15 +7172,15 @@ msgstr "Извините, у нас определённые техническ #~ "strong> в вашем браузере. Проверка электронной почты необходима для того " #~ "чтобы убедиться в правильности email на форуме <span class=\"orange" #~ "\">Вопросов&Ответов</span>. Если вы желаете использовать " -#~ "<strong>другой email</strong>, пожалуйста <a " -#~ "href='%(change_email_url)s'><strong>измените его снова</strong></a>." +#~ "<strong>другой email</strong>, пожалуйста <a href='%(change_email_url)" +#~ "s'><strong>измените его снова</strong></a>." #~ msgid "old %(email)s kept, if you like go to %(change_email_url)s" #~ msgstr "" #~ "<span class=\"strong big\">Ваш email адрес %(email)s не изменился.</span> " #~ "Если вы решите изменить его позже - вы всегда можете сделать это " -#~ "отредактировав ваш профиль или используя <a " -#~ "href='%(change_email_url)s'><strong>предыдущую форму</strong></a> снова." +#~ "отредактировав ваш профиль или используя <a href='%(change_email_url)" +#~ "s'><strong>предыдущую форму</strong></a> снова." #~ msgid "your current %(email)s can be used for this" #~ msgstr "" @@ -7189,8 +7211,8 @@ msgstr "Извините, у нас определённые техническ #~ "свой <strong>email</strong> адрес. Сохраненный email адрес позволит " #~ "вам<strong>подписываться на изменения</strong> наиболее интересных " #~ "вопросов и будет использоваться чтобы создать и получать в дальнейшем " -#~ "уникальное изображение для вашего аватара - <a " -#~ "href='%(gravatar_faq_url)s'><strong>gravatar</strong></a>.</p>" +#~ "уникальное изображение для вашего аватара - <a href='%(gravatar_faq_url)" +#~ "s'><strong>gravatar</strong></a>.</p>" #~ msgid "" #~ "%(username)s already exists, choose another name for \n" @@ -7198,16 +7220,16 @@ msgstr "Извините, у нас определённые техническ #~ "%(gravatar_faq_url)s\n" #~ " " #~ msgstr "" -#~ "<p><span class='strong big'>К сожалению looks похоже что имя " -#~ "%(username)s используется другим пользователем.</span></p><p>Пожалуйста " -#~ "выберите другое имя для использования вместе с вашим %(provider)s " -#~ "логином. Также, правильный email адрес нужен для использования на форуме " -#~ "<span class='orange'>Вопросов&Ответов</span>. Ваш email адрес " -#~ "используется для того чтобы создать уникальный <a " -#~ "href='%(gravatar_faq_url)s'><strong>аватар</strong></a>, картинку которая " -#~ "ассоциируется с вашей учётной записью. Если вы хотите, вы можете " -#~ "<strong>получать уведомления</strong> о интересных вопросах или о всём " -#~ "форуме через email. Email адрес никогда не показывается кому-то ещё.</p>" +#~ "<p><span class='strong big'>К сожалению looks похоже что имя %(username)" +#~ "s используется другим пользователем.</span></p><p>Пожалуйста выберите " +#~ "другое имя для использования вместе с вашим %(provider)s логином. Также, " +#~ "правильный email адрес нужен для использования на форуме <span " +#~ "class='orange'>Вопросов&Ответов</span>. Ваш email адрес используется " +#~ "для того чтобы создать уникальный <a href='%(gravatar_faq_url)" +#~ "s'><strong>аватар</strong></a>, картинку которая ассоциируется с вашей " +#~ "учётной записью. Если вы хотите, вы можете <strong>получать уведомления</" +#~ "strong> о интересных вопросах или о всём форуме через email. Email адрес " +#~ "никогда не показывается кому-то ещё.</p>" #~ msgid "" #~ "register new external %(provider)s account info, see %(gravatar_faq_url)s" @@ -7228,8 +7250,8 @@ msgstr "Извините, у нас определённые техническ #~ "<strong>email</strong> адрес. Сохраненный email адрес позволит " #~ "вам<strong>подписываться на изменения</strong> наиболее интересных " #~ "вопросов и будет использоваться чтобы создать и получать в дальнейшем " -#~ "уникальное изображение для вашего аватара - <a " -#~ "href='%(gravatar_faq_url)s'><strong>gravatar</strong></a>.</p>" +#~ "уникальное изображение для вашего аватара - <a href='%(gravatar_faq_url)" +#~ "s'><strong>gravatar</strong></a>.</p>" #~ msgid "This account already exists, please use another." #~ msgstr "Эта учётная запись уже существует, пожалуйста используйте другую." diff --git a/askbot/skins/default/templates/macros.html b/askbot/skins/default/templates/macros.html index e0de6bb6..20e2055c 100644 --- a/askbot/skins/default/templates/macros.html +++ b/askbot/skins/default/templates/macros.html @@ -603,7 +603,7 @@ answer {% if answer.accepted() %}accepted-answer{% endif %} {% if answer.author_ alt="{% trans username=user.username %}responses for {{username}}{% endtrans %}" {% if user.new_response_count > 0 %} src="{{ "/images/mail-envelope-full.png"|media }}" - title="{% trans response_count=user.new_response_count %}you have a new response{% pluralize %}you have {{response_count}} new responses{% endtrans %}" + title="{% trans response_count=user.new_response_count %}you have {{response_count}} new response{% pluralize %}you have {{response_count}} new responses{% endtrans %}" {% elif user.seen_response_count > 0 %} src="{{ "/images/mail-envelope-empty.png"|media }}" title="{% trans %}no new responses yet{% endtrans %}" |