From: rick
Date: Thu, 13 May 2010 21:36:57 +0000 (+0000)
Subject: Added a new optional setting for "support" URL that gets shown in the footer
X-Git-Tag: live~865
X-Git-Url: https://git.openstreetmap.org./osqa.git/commitdiff_plain/cec50f4a763e8cbd9855ece5af43876471aec874
Added a new optional setting for "support" URL that gets shown in the footer
Changed "provacy policy" to "privacy"
Added a new optional setting for "contact us" to show in footer instead of oled "give feedback"
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@265 0cfe37f9-358a-4d5e-be75-b63607b5c754
---
diff --git a/forum/context.py b/forum/context.py
index 6048261..e937810 100644
--- a/forum/context.py
+++ b/forum/context.py
@@ -12,7 +12,8 @@ def application_settings(context):
'APP_INTRO' : settings.APP_INTRO,
'APP_LOGO' : settings.APP_LOGO,
'EMAIL_VALIDATION': 'off',
- 'FEEDBACK_SITE_URL': settings.FEEDBACK_SITE_URL,
+ 'SUPPORT_URL': settings.SUPPORT_URL,
+ 'CONTACT_URL': settings.CONTACT_URL,
'FORUM_SCRIPT_ALIAS': djsettings.FORUM_SCRIPT_ALIAS,
'LANGUAGE_CODE': djsettings.LANGUAGE_CODE,
'GOOGLE_SITEMAP_CODE':settings.GOOGLE_SITEMAP_CODE,
diff --git a/forum/settings/basic.py b/forum/settings/basic.py
index a3382b1..ec4d141 100644
--- a/forum/settings/basic.py
+++ b/forum/settings/basic.py
@@ -39,8 +39,14 @@ APP_COPYRIGHT = Setting('APP_COPYRIGHT', u'Copyright OSQA, 2010. Some rights res
label = _("Copyright notice"),
help_text = _("The copyright notice visible at the footer of your page.")))
-FEEDBACK_SITE_URL = Setting('FEEDBACK_SITE_URL', '', BASIC_SET, dict(
-label = _("Feedback site url"),
-help_text = _("If you have a specific place to get feedback from your users, use this field and the fedback link on the footer will point there."),
+SUPPORT_URL = Setting('SUPPORT_URL', '', BASIC_SET, dict(
+label = _("Support URL"),
+help_text = _("The URL provided for users to get support. It can be http: or mailto: or whatever your preferred support scheme is."),
required=False))
+CONTACT_URL = Setting('CONTACT_URL', '', BASIC_SET, dict(
+label = _("Contact URL"),
+help_text = _("The URL provided for users to contact you. It can be http: or mailto: or whatever your preferred contact scheme is."),
+required=False))
+
+
diff --git a/forum/skins/default/templates/footer.html b/forum/skins/default/templates/footer.html
index 907669a..b92f06b 100644
--- a/forum/skins/default/templates/footer.html
+++ b/forum/skins/default/templates/footer.html
@@ -6,16 +6,19 @@
diff --git a/forum/urls.py b/forum/urls.py
index 71f4149..d6f320a 100644
--- a/forum/urls.py
+++ b/forum/urls.py
@@ -109,7 +109,7 @@ urlpatterns += patterns('',
url(r'^feeds/(?P.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}, name='feeds'),
url(r'^%s$' % _('upload/'), app.writers.upload, name='upload'),
url(r'^%s$' % _('search/'), app.readers.search, name='search'),
- url(r'^%s$' % _('feedback/'), app.meta.feedback, name='feedback'),
+ url(r'^%s$' % _('contact/'), app.meta.feedback, name='feedback'),
(r'^i18n/', include('django.conf.urls.i18n')),
diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index 9578baa..bd7c3c4 100644
Binary files a/locale/en/LC_MESSAGES/django.mo and b/locale/en/LC_MESSAGES/django.mo differ
diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index b694570..f62d47b 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -2,19 +2,19 @@
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR , YEAR.
-#
-#, fuzzy
+#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-04-28 16:53-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2010-05-13 17:06\n"
+"Last-Translator: Rick Ross \n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Translated-Using: django-rosetta 0.5.3\n"
#: forum/const.py:8
msgid "duplicate question"
@@ -210,8 +210,7 @@ msgid "tags"
msgstr ""
#: forum/forms.py:54
-msgid ""
-"Tags are short keywords, with no spaces within. Up to five tags can be used."
+msgid "Tags are short keywords, with no spaces within. Up to five tags can be used."
msgstr ""
#: forum/forms.py:61 forum/skins/default/templates/question_retag.html:43
@@ -227,9 +226,7 @@ msgid "tags must be shorter than 20 characters"
msgstr ""
#: forum/forms.py:74
-msgid ""
-"please use following characters in tags: letters 'a-z', numbers, and "
-"characters '.-_#'"
+msgid "please use following characters in tags: letters 'a-z', numbers, and characters '.-_#'"
msgstr ""
#: forum/forms.py:84
@@ -240,9 +237,7 @@ msgid "community wiki"
msgstr ""
#: forum/forms.py:85
-msgid ""
-"if you choose community wiki option, the question and answer do not generate "
-"points and name of author will not be shown"
+msgid "if you choose community wiki option, the question and answer do not generate points and name of author will not be shown"
msgstr ""
#: forum/forms.py:101
@@ -250,9 +245,7 @@ msgid "update summary:"
msgstr ""
#: forum/forms.py:102
-msgid ""
-"enter a brief summary of your revision (e.g. fixed spelling, grammar, "
-"improved style, this field is optional)"
+msgid "enter a brief summary of your revision (e.g. fixed spelling, grammar, improved style, this field is optional)"
msgstr ""
#: forum/forms.py:105
@@ -587,9 +580,7 @@ msgstr ""
#: forum/authentication/forms.py:21
#, fuzzy
msgid "Your account email"
-msgstr ""
-"Your new Email: (will not be shown to "
-"anyone, must be valid)"
+msgstr "Your new Email: (will not be shown to anyone, must be valid)"
#: forum/authentication/forms.py:23
msgid "You cannot leave this field blank"
@@ -620,9 +611,7 @@ msgid "Current password"
msgstr ""
#: forum/authentication/forms.py:62
-msgid ""
-"Old password is incorrect. Please enter the correct "
-"password."
+msgid "Old password is incorrect. Please enter the correct password."
msgstr ""
#: forum/management/commands/send_email_alerts.py:56
@@ -724,9 +713,7 @@ msgstr ""
#: forum/settings/basic.py:13
#, fuzzy
msgid "Your site main logo."
-msgstr ""
-"Your new Email: (will not be shown to "
-"anyone, must be valid)"
+msgstr "Your new Email: (will not be shown to anyone, must be valid)"
#: forum/settings/basic.py:17
msgid "Favicon"
@@ -759,9 +746,7 @@ msgstr ""
#: forum/settings/basic.py:34
#, fuzzy
msgid "Application description"
-msgstr ""
-"Gold badge is the highest award in this community. To obtain it have to show "
-"profound knowledge and ability in addition to your active participation."
+msgstr "Gold badge is the highest award in this community. To obtain it have to show profound knowledge and ability in addition to your active participation."
#: forum/settings/basic.py:35
msgid "The description of your application"
@@ -772,8 +757,7 @@ msgid "Application intro"
msgstr ""
#: forum/settings/basic.py:40
-msgid ""
-"The introductory page that is visible in the sidebar for anonymous users."
+msgid "The introductory page that is visible in the sidebar for anonymous users."
msgstr ""
#: forum/settings/basic.py:44
@@ -813,9 +797,7 @@ msgid "Email Port"
msgstr ""
#: forum/settings/email.py:14
-msgid ""
-"The port on which your SMTP server is listening to. Usually this is 25, but "
-"can be something else."
+msgid "The port on which your SMTP server is listening to. Usually this is 25, but can be something else."
msgstr ""
#: forum/settings/email.py:18
@@ -848,9 +830,7 @@ msgid "Site 'from' email address"
msgstr "Your email (never shared)"
#: forum/settings/email.py:35
-msgid ""
-"The address that will show up on the 'from' field on emails sent by your "
-"website."
+msgid "The address that will show up on the 'from' field on emails sent by your website."
msgstr ""
#: forum/settings/email.py:39
@@ -859,10 +839,7 @@ msgid "Email subject prefix"
msgstr "Welcome to the Q&A forum"
#: forum/settings/email.py:40
-msgid ""
-"Every email sent through your website will have the subject prefixed by this "
-"string. It's usually a good idea to have such a prefix so your users can "
-"easilly set up a filter on theyr email clients."
+msgid "Every email sent through your website will have the subject prefixed by this string. It's usually a good idea to have such a prefix so your users can easilly set up a filter on theyr email clients."
msgstr ""
#: forum/settings/extkeys.py:4
@@ -870,8 +847,7 @@ msgid "External Keys"
msgstr ""
#: forum/settings/extkeys.py:4
-msgid ""
-"Keys for various external providers that your application may optionally use."
+msgid "Keys for various external providers that your application may optionally use."
msgstr ""
#: forum/settings/extkeys.py:7
@@ -879,9 +855,7 @@ msgid "Google sitemap code"
msgstr ""
#: forum/settings/extkeys.py:8
-msgid ""
-"This is the code you get when you register your site at Google webmaster central."
+msgid "This is the code you get when you register your site at Google webmaster central."
msgstr ""
#: forum/settings/extkeys.py:12
@@ -889,9 +863,7 @@ msgid "Google analytics key"
msgstr ""
#: forum/settings/extkeys.py:13
-msgid ""
-"Your Google analytics key. You can get one at the Google analytics official website"
+msgid "Your Google analytics key. You can get one at the Google analytics official website"
msgstr ""
#: forum/settings/forms.py:40
@@ -905,9 +877,7 @@ msgid "Minimum reputation config"
msgstr "karma"
#: forum/settings/minrep.py:4
-msgid ""
-"Configure the minimum reputation required to perform certain actions on your "
-"site."
+msgid "Configure the minimum reputation required to perform certain actions on your site."
msgstr ""
#: forum/settings/minrep.py:7
@@ -941,8 +911,7 @@ msgid "Minimum reputation to comment"
msgstr "user karma"
#: forum/settings/minrep.py:20
-msgid ""
-"The minimum reputation an user must have to be allowed to comment a post."
+msgid "The minimum reputation an user must have to be allowed to comment a post."
msgstr ""
#: forum/settings/minrep.py:23
@@ -951,8 +920,7 @@ msgid "Minimum reputation to like a comment"
msgstr "user karma"
#: forum/settings/minrep.py:24
-msgid ""
-"The minimum reputation an user must have to be allowed to \"like\" a comment."
+msgid "The minimum reputation an user must have to be allowed to \"like\" a comment."
msgstr ""
#: forum/settings/minrep.py:27
@@ -960,8 +928,7 @@ msgid "Minimum reputation to upload"
msgstr ""
#: forum/settings/minrep.py:28
-msgid ""
-"The minimum reputation an user must have to be allowed to upload a file."
+msgid "The minimum reputation an user must have to be allowed to upload a file."
msgstr ""
#: forum/settings/minrep.py:31
@@ -969,9 +936,7 @@ msgid "Minimum reputation to close own question"
msgstr ""
#: forum/settings/minrep.py:32
-msgid ""
-"The minimum reputation an user must have to be allowed to close his own "
-"question."
+msgid "The minimum reputation an user must have to be allowed to close his own question."
msgstr ""
#: forum/settings/minrep.py:35
@@ -979,9 +944,7 @@ msgid "Minimum reputation to reopen own question"
msgstr ""
#: forum/settings/minrep.py:36
-msgid ""
-"The minimum reputation an user must have to be allowed to reopen his own "
-"question."
+msgid "The minimum reputation an user must have to be allowed to reopen his own question."
msgstr ""
#: forum/settings/minrep.py:39
@@ -989,9 +952,7 @@ msgid "Minimum reputation to retag others questions"
msgstr ""
#: forum/settings/minrep.py:40
-msgid ""
-"The minimum reputation an user must have to be allowed to retag others "
-"questions."
+msgid "The minimum reputation an user must have to be allowed to retag others questions."
msgstr ""
#: forum/settings/minrep.py:43
@@ -999,9 +960,7 @@ msgid "Minimum reputation to edit wiki posts"
msgstr ""
#: forum/settings/minrep.py:44
-msgid ""
-"The minimum reputation an user must have to be allowed to edit community "
-"wiki posts."
+msgid "The minimum reputation an user must have to be allowed to edit community wiki posts."
msgstr ""
#: forum/settings/minrep.py:47
@@ -1009,8 +968,7 @@ msgid "Minimum reputation to edit others posts"
msgstr ""
#: forum/settings/minrep.py:48
-msgid ""
-"The minimum reputation an user must have to be allowed to edit others posts."
+msgid "The minimum reputation an user must have to be allowed to edit others posts."
msgstr ""
#: forum/settings/minrep.py:51
@@ -1018,8 +976,7 @@ msgid "Minimum reputation to close others posts"
msgstr ""
#: forum/settings/minrep.py:52
-msgid ""
-"The minimum reputation an user must have to be allowed to close others posts."
+msgid "The minimum reputation an user must have to be allowed to close others posts."
msgstr ""
#: forum/settings/minrep.py:55
@@ -1028,8 +985,7 @@ msgid "Minimum reputation to delete comments"
msgstr "user karma"
#: forum/settings/minrep.py:56
-msgid ""
-"The minimum reputation an user must have to be allowed to delete comments."
+msgid "The minimum reputation an user must have to be allowed to delete comments."
msgstr ""
#: forum/settings/minrep.py:59
@@ -1045,8 +1001,7 @@ msgid "Reputation gains and losses config"
msgstr ""
#: forum/settings/repgain.py:4
-msgid ""
-"Configure the reputation points a user may gain or lose upon certain actions."
+msgid "Configure the reputation points a user may gain or lose upon certain actions."
msgstr ""
#: forum/settings/repgain.py:7
@@ -1075,8 +1030,7 @@ msgid "Rep lost bu upvote canceled"
msgstr ""
#: forum/settings/repgain.py:20
-msgid ""
-"Reputation a user loses for having one of the upvotes on his posts canceled."
+msgid "Reputation a user loses for having one of the upvotes on his posts canceled."
msgstr ""
#: forum/settings/repgain.py:23
@@ -1100,9 +1054,7 @@ msgid "Rep gain by downvote canceled"
msgstr ""
#: forum/settings/repgain.py:32
-msgid ""
-"Reputation a user gains for having one of the downvotes on his posts "
-"canceled."
+msgid "Reputation a user gains for having one of the downvotes on his posts canceled."
msgstr ""
#: forum/settings/repgain.py:35
@@ -1126,8 +1078,7 @@ msgid "Rep lost by accepted canceled"
msgstr ""
#: forum/settings/repgain.py:44
-msgid ""
-"Reputation a user loses for having one of his accepted answers canceled."
+msgid "Reputation a user loses for having one of his accepted answers canceled."
msgstr ""
#: forum/settings/repgain.py:47
@@ -1135,8 +1086,7 @@ msgid "Rep gain by accepting answer"
msgstr ""
#: forum/settings/repgain.py:48
-msgid ""
-"Reputation a user gains for accepting an answer to one of his questions."
+msgid "Reputation a user gains for accepting an answer to one of his questions."
msgstr ""
#: forum/settings/repgain.py:51
@@ -1160,9 +1110,7 @@ msgid "Rep lost by post flagged and hidden"
msgstr ""
#: forum/settings/repgain.py:60
-msgid ""
-"Reputation a user loses by having the last revision of one of his posts "
-"flagged the enough number of times to hide the post."
+msgid "Reputation a user loses by having the last revision of one of his posts flagged the enough number of times to hide the post."
msgstr ""
#: forum/settings/repgain.py:63
@@ -1170,9 +1118,7 @@ msgid "Rep lost by post flagged and deleted"
msgstr ""
#: forum/settings/repgain.py:64
-msgid ""
-"Reputation a user loses by having the last revision of one of his posts "
-"flagged the enough number of times to delete the post."
+msgid "Reputation a user loses by having the last revision of one of his posts flagged the enough number of times to delete the post."
msgstr ""
#: forum/settings/upload.py:5
@@ -1188,9 +1134,7 @@ msgid "Uploaded files folder"
msgstr ""
#: forum/settings/upload.py:9
-msgid ""
-"The filesystem path where uploaded files will be stored. Please note that "
-"this folder must exist."
+msgid "The filesystem path where uploaded files will be stored. Please note that this folder must exist."
msgstr ""
#: forum/settings/upload.py:12
@@ -1198,9 +1142,7 @@ msgid "Uploaded files alias"
msgstr ""
#: forum/settings/upload.py:13
-msgid ""
-"The url alias for uploaded files. Notice that if you change this setting, "
-"you'll need to restart your site."
+msgid "The url alias for uploaded files. Notice that if you change this setting, you'll need to restart your site."
msgstr ""
#: forum/settings/upload.py:16
@@ -1248,8 +1190,7 @@ msgid "Flag count to hide post"
msgstr ""
#: forum/settings/voting.py:20
-msgid ""
-"How many times a post needs to be flagged to be hidden from the main page."
+msgid "How many times a post needs to be flagged to be hidden from the main page."
msgstr ""
#: forum/settings/voting.py:23
@@ -1285,9 +1226,7 @@ msgid "url has error - please check it;"
msgstr ""
#: forum/skins/default/templates/404.html:30
-msgid ""
-"the page you tried to visit is protected or you don't have sufficient "
-"points, see"
+msgid "the page you tried to visit is protected or you don't have sufficient points, see"
msgstr ""
#: forum/skins/default/templates/404.html:31
@@ -1565,12 +1504,7 @@ msgstr ""
#: forum/skins/default/templates/ask.html:64
msgid "login to post question info"
-msgstr ""
-"You are welcome to start submitting your question "
-"anonymously. 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 "You are welcome to start submitting your question anonymously. 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."
#: forum/skins/default/templates/ask.html:70
#, python-format
@@ -1578,12 +1512,7 @@ msgid ""
"must have valid %(email)s to post, \n"
" see %(email_validation_faq_url)s\n"
" "
-msgstr ""
-"Looks like your email address, %(email)s has not "
-"yet been validated. To post messages you must verify your email, "
-"please see more details here."
-"
You can submit your question now and validate email after that. Your "
-"question will saved as pending meanwhile. "
+msgstr "Looks like your email address, %(email)s has not yet been validated. To post messages you must verify your email, please see more details here.
You can submit your question now and validate email after that. Your question will saved as pending meanwhile. "
#: forum/skins/default/templates/ask.html:108
msgid "(required)"
@@ -1616,24 +1545,15 @@ msgstr ""
#: forum/skins/default/templates/badges.html:21
msgid "Community gives you awards for your questions, answers and votes."
-msgstr ""
-"If your questions and answers are highly voted, your contribution to this "
-"Q&A community will be recognized with the variety of badges."
+msgstr "If your questions and answers are highly voted, your contribution to this Q&A community will be recognized with the variety of badges."
#: forum/skins/default/templates/badges.html:22
#, 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. Give us feedback at %(feedback_faq_url)s.\n"
" "
-msgstr ""
-"Currently badges differ only by their level: gold, "
-"silver and bronze (their meanings are "
-"described on the right). In the future there will be many types of badges at "
-"each level. Please give us your feedback - what kinds of badges would you like to see and "
-"suggest the activity for which those badges might be awarded."
+msgstr "Currently badges differ only by their level: gold, silver and bronze (their meanings are described on the right). In the future there will be many types of badges at each level. Please give us your feedback - what kinds of badges would you like to see and suggest the activity for which those badges might be awarded."
#: forum/skins/default/templates/badges.html:50
msgid "Community badges"
@@ -1641,15 +1561,11 @@ msgstr "Badge levels"
#: forum/skins/default/templates/badges.html:56
msgid "gold badge description"
-msgstr ""
-"Gold badge is the highest award in this community. To obtain it have to show "
-"profound knowledge and ability in addition to your active participation."
+msgstr "Gold badge is the highest award in this community. To obtain it have to show profound knowledge and ability in addition to your active participation."
#: forum/skins/default/templates/badges.html:64
msgid "silver badge description"
-msgstr ""
-"Obtaining silver badge requires significant patience. If you have received "
-"one, that means you have greatly contributed to this community."
+msgstr "Obtaining silver badge requires significant patience. If you have received one, that means you have greatly contributed to this community."
#: forum/skins/default/templates/badges.html:67
msgid "bronze badge: often given as a special honor"
@@ -1657,9 +1573,7 @@ msgstr ""
#: forum/skins/default/templates/badges.html:71
msgid "bronze badge description"
-msgstr ""
-"If you are an active participant in this community, you will be recognized "
-"with this badge."
+msgstr "If you are an active participant in this community, you will be recognized with this badge."
#: forum/skins/default/templates/book.html:7
msgid "reading channel"
@@ -1769,27 +1683,19 @@ msgid "What kinds of questions can I ask here?"
msgstr ""
#: forum/skins/default/templates/faq.html:17
-msgid ""
-"Most importantly - questions should be relevant to this "
-"community."
+msgid "Most importantly - questions should be relevant to this community."
msgstr ""
#: forum/skins/default/templates/faq.html:18
-msgid ""
-"Before asking the question - please make sure to use search to see whether "
-"your question has alredy been answered."
-msgstr ""
-"Before you ask - please make sure to search for a similar question. You can "
-"search questions by their title or tags."
+msgid "Before asking the question - please make sure to use search to see whether your question has alredy been answered."
+msgstr "Before you ask - please make sure to search for a similar question. You can search questions by their title or tags."
#: forum/skins/default/templates/faq.html:21
msgid "What questions should I avoid asking?"
msgstr "What kinds of questions should be avoided?"
#: forum/skins/default/templates/faq.html:22
-msgid ""
-"Please avoid asking questions that are not relevant to this community, too "
-"subjective and argumentative."
+msgid "Please avoid asking questions that are not relevant to this community, too subjective and argumentative."
msgstr ""
#: forum/skins/default/templates/faq.html:27
@@ -1797,15 +1703,8 @@ msgid "What should I avoid in my answers?"
msgstr ""
#: forum/skins/default/templates/faq.html:28
-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."
-msgstr ""
-"is a question and answer site - it is not a "
-"discussion group. 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."
+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."
+msgstr "is a question and answer site - it is not a discussion group. 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."
#: forum/skins/default/templates/faq.html:32
msgid "Who moderates this community?"
@@ -1820,12 +1719,8 @@ msgid "This website is moderated by the users."
msgstr ""
#: forum/skins/default/templates/faq.html:35
-msgid ""
-"The reputation system allows users earn the authorization to perform a "
-"variety of moderation tasks."
-msgstr ""
-"Karma system allows users to earn rights to perform a variety of moderation "
-"tasks"
+msgid "The reputation system allows users earn the authorization to perform a variety of moderation tasks."
+msgstr "Karma system allows users to earn rights to perform a variety of moderation tasks"
#: forum/skins/default/templates/faq.html:40
msgid "How does reputation system work?"
@@ -1833,21 +1728,10 @@ msgstr "How does karma system work?"
#: forum/skins/default/templates/faq.html:41
msgid "Rep system summary"
-msgstr ""
-"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 "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."
#: forum/skins/default/templates/faq.html:42
-msgid ""
-"For example, if you ask an interesting question or give a helpful answer, "
-"your input will be upvoted. On the other hand if the answer is misleading - "
-"it will be downvoted. Each vote in favor will generate 10 "
-"points, each vote against will subtract 2 points. There is "
-"a limit of 200 points that can be accumulated per question "
-"or answer. The table below explains reputation point requirements for each "
-"type of moderation task."
+msgid "For example, if you ask an interesting question or give a helpful answer, your input will be upvoted. On the other hand if the answer is misleading - it will be downvoted. Each vote in favor will generate 10 points, each vote against will subtract 2 points. There is a limit of 200 points that can be accumulated per question or answer. The table below explains reputation point requirements for each type of moderation task."
msgstr ""
#: forum/skins/default/templates/faq.html:53
@@ -1904,21 +1788,8 @@ msgstr "How to validate email and why?"
#: forum/skins/default/templates/faq.html:105
#, python-format
-msgid ""
-"how to validate email info with %(send_email_key_url)s %(gravatar_faq_url)s"
-msgstr ""
-"Why? Email validation is required to make sure that "
-"only you can post messages on your behalf and to "
-"minimize spam posts.
With email you can "
-"subscribe for updates on the most interesting questions. "
-"Also, when you sign up for the first time - create a unique gravatar personal image.
"
+msgid "how to validate email info with %(send_email_key_url)s %(gravatar_faq_url)s"
+msgstr "Why? Email validation is required to make sure that only you can post messages on your behalf and to minimize spam posts.
With email you can subscribe for updates on the most interesting questions. Also, when you sign up for the first time - create a unique gravatar personal image."
#: forum/skins/default/templates/faq.html:110
msgid "what is gravatar"
@@ -1926,23 +1797,14 @@ msgstr "What is gravatar?"
#: forum/skins/default/templates/faq.html:111
msgid "gravatar faq info"
-msgstr ""
-"Gravatar means globally r"
-"strong>ecognized avatar - your unique avatar image "
-"associated with your email address. It's simply a picture that shows next to "
-"your posts on the websites that support gravatar protocol. By default gravar "
-"appears as a square filled with a snowflake-like figure. You can set "
-"your image at gravatar.com"
-"strong>"
+msgstr "Gravatar means globally recognized avatar - your unique avatar image associated with your email address. It's simply a picture that shows next to your posts on the websites that support gravatar protocol. By default gravar appears as a square filled with a snowflake-like figure. You can set your image at gravatar.com"
#: forum/skins/default/templates/faq.html:114
msgid "To register, do I need to create new password?"
msgstr ""
#: forum/skins/default/templates/faq.html:115
-msgid ""
-"No, you don't have to. You can login through any service that supports "
-"OpenID, e.g. Google, Yahoo, AOL, etc."
+msgid "No, you don't have to. You can login through any service that supports OpenID, e.g. Google, Yahoo, AOL, etc."
msgstr ""
#: forum/skins/default/templates/faq.html:116
@@ -1958,10 +1820,7 @@ msgid "Goal of this site is..."
msgstr ""
#: forum/skins/default/templates/faq.html:122
-msgid ""
-"So questions and answers can be edited like wiki pages by experienced users "
-"of this site and this improves the overall quality of the knowledge base "
-"content."
+msgid "So questions and answers can be edited like wiki pages by experienced users of this site and this improves the overall quality of the knowledge base content."
msgstr ""
#: forum/skins/default/templates/faq.html:123
@@ -1974,12 +1833,8 @@ msgstr ""
#: forum/skins/default/templates/faq.html:128
#, python-format
-msgid ""
-"Please ask your question at %(ask_question_url)s, help make our community "
-"better!"
-msgstr ""
-"Please ask your question, help make our "
-"community better!"
+msgid "Please ask your question at %(ask_question_url)s, help make our community better!"
+msgstr "Please ask your question, help make our community better!"
#: forum/skins/default/templates/faq.html:130
#: forum/skins/default/templates/header.html:30
@@ -2003,8 +1858,7 @@ msgstr ""
#, python-format
msgid ""
"\n"
-" Dear %(user_name)s, we look "
-"forward to hearing your feedback. \n"
+" Dear %(user_name)s, we look forward to hearing your feedback. \n"
" Please type and send us your message below.\n"
" "
msgstr ""
@@ -2012,8 +1866,7 @@ msgstr ""
#: forum/skins/default/templates/feedback.html:24
msgid ""
"\n"
-" Dear visitor, we look forward to "
-"hearing your feedback.\n"
+" Dear visitor, we look forward to hearing your feedback.\n"
" Please type and send us your message below.\n"
" "
msgstr ""
@@ -2041,7 +1894,7 @@ msgstr ""
#: forum/skins/default/templates/footer.html:9
msgid "privacy policy"
-msgstr ""
+msgstr "privacy"
#: forum/skins/default/templates/footer.html:18
msgid "give feedback"
@@ -2099,13 +1952,8 @@ msgid "Logout"
msgstr ""
#: forum/skins/default/templates/logout.html:19
-msgid ""
-"As a registered user you can login with your OpenID, log out of the site or "
-"permanently remove your account."
-msgstr ""
-"Clicking Logout will log you out from the forumbut will not "
-"sign you off from your OpenID provider.If you wish to sign off "
-"completely - please make sure to log out from your OpenID provider as well."
+msgid "As a registered user you can login with your OpenID, log out of the site or permanently remove your account."
+msgstr "Clicking Logout will log you out from the forumbut will not sign you off from your OpenID provider.
If you wish to sign off completely - please make sure to log out from your OpenID provider as well."
#: forum/skins/default/templates/logout.html:20
msgid "Logout now"
@@ -2174,10 +2022,7 @@ msgstr ""
#: forum/skins/default/templates/privacy.html:15
msgid "general message about privacy"
-msgstr ""
-"Respecting users privacy is an important core principle of this Q&A "
-"forum. Information on this page details how this forum protects your "
-"privacy, and what type of information is collected."
+msgstr "Respecting users privacy is an important core principle of this Q&A forum. Information on this page details how this forum protects your privacy, and what type of information is collected."
#: forum/skins/default/templates/privacy.html:18
msgid "Site Visitors"
@@ -2185,10 +2030,7 @@ msgstr ""
#: forum/skins/default/templates/privacy.html:20
msgid "what technical information is collected about visitors"
-msgstr ""
-"Information on question views, revisions of questions and answers - both "
-"times and content are recorded for each user in order to correctly count "
-"number of views, maintain data integrity and report relevant updates."
+msgstr "Information on question views, revisions of questions and answers - both times and content are recorded for each user in order to correctly count number of views, maintain data integrity and report relevant updates."
#: forum/skins/default/templates/privacy.html:23
msgid "Personal Information"
@@ -2196,10 +2038,7 @@ msgstr ""
#: forum/skins/default/templates/privacy.html:25
msgid "details on personal information policies"
-msgstr ""
-"Members of this community may choose to display personally identifiable "
-"information in their profiles. Forum will never display such information "
-"without a request from the user."
+msgstr "Members of this community may choose to display personally identifiable information in their profiles. Forum will never display such information without a request from the user."
#: forum/skins/default/templates/privacy.html:28
msgid "Other Services"
@@ -2207,16 +2046,11 @@ msgstr ""
#: forum/skins/default/templates/privacy.html:30
msgid "details on sharing data with third parties"
-msgstr ""
-"None of the data that is not openly shown on the forum by the choice of the "
-"user is shared with any third party."
+msgstr "None of the data that is not openly shown on the forum by the choice of the user is shared with any third party."
#: forum/skins/default/templates/privacy.html:35
msgid "cookie policy details"
-msgstr ""
-"Forum software relies on the internet cookie technology to keep track of "
-"user sessions. Cookies must be enabled in your browser so that forum can "
-"work for you."
+msgstr "Forum software relies on the internet cookie technology to keep track of user sessions. Cookies must be enabled in your browser so that forum can work for you."
#: forum/skins/default/templates/privacy.html:37
msgid "Policy Changes"
@@ -2224,10 +2058,7 @@ msgstr ""
#: forum/skins/default/templates/privacy.html:38
msgid "how privacy policies can be changed"
-msgstr ""
-"These policies may be adjusted to improve protection of user's privacy. "
-"Whenever such changes occur, users will be notified via the internal "
-"messaging system. "
+msgstr "These policies may be adjusted to improve protection of user's privacy. Whenever such changes occur, users will be notified via the internal messaging system. "
#: forum/skins/default/templates/question.html:70
#: forum/skins/default/templates/sidebar/recent_tags.html:9
@@ -2237,8 +2068,7 @@ msgstr ""
#: forum/skins/default/templates/question.html:87
#, python-format
-msgid ""
-"The question has been closed for the following reason \"%(close_reason)s\" by"
+msgid "The question has been closed for the following reason \"%(close_reason)s\" by"
msgstr ""
#: forum/skins/default/templates/question.html:89
@@ -2293,32 +2123,15 @@ msgstr ""
#: forum/skins/default/templates/question.html:165
msgid "you can answer anonymously and then login"
-msgstr ""
-"Please start posting your answer anonymously "
-"- 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 substantial "
-"answer, for discussions, please use comments and "
-"please do remember to vote (after you log in)!"
+msgstr "Please start posting your answer anonymously - 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 substantial answer, for discussions, please use comments and please do remember to vote (after you log in)!"
#: forum/skins/default/templates/question.html:169
msgid "answer your own question only to give an answer"
-msgstr ""
-"You are welcome to answer your own question, "
-"but please make sure to give an answer. Remember that you "
-"can always revise your original question. Please "
-"use comments for discussions and please don't "
-"forget to vote :) for the answers that you liked (or perhaps did "
-"not like)! "
+msgstr "You are welcome to answer your own question, but please make sure to give an answer. Remember that you can always revise your original question. Please use comments for discussions and please don't forget to vote :) for the answers that you liked (or perhaps did not like)! "
#: forum/skins/default/templates/question.html:171
msgid "please only give an answer, no discussions"
-msgstr ""
-"Please try to give a substantial answer. If "
-"you wanted to comment on the question or answer, just use the "
-"commenting tool. Please remember that you can always revise "
-"your answers - no need to answer the same question twice. Also, "
-"please don't forget to vote - it really helps to select the "
-"best questions and answers!"
+msgstr "Please try to give a substantial answer. If you wanted to comment on the question or answer, just use the commenting tool. Please remember that you can always revise your answers - no need to answer the same question twice. Also, please don't forget to vote - it really helps to select the best questions and answers!"
#: forum/skins/default/templates/question.html:207
msgid "Login/Signup to Post Your Answer"
@@ -2480,17 +2293,14 @@ msgstr ""
#, python-format
msgid ""
"\n"
-" (you can adjust your notification settings on your profile)\n"
+" (you can adjust your notification settings on your profile)\n"
" "
msgstr ""
#: forum/skins/default/templates/subscription_status.html:29
#, fuzzy
msgid "Once you sign in you will be able to subscribe for any updates here"
-msgstr ""
-"Here (once you log in) you will be able to sign "
-"up for the periodic email updates about this question."
+msgstr "Here (once you log in) you will be able to sign up for the periodic email updates about this question."
#: forum/skins/default/templates/tag_selector.html:4
#: forum/skins/default/templates/question_list/tag_selector.html:6
@@ -2574,9 +2384,7 @@ msgid "Authentication settings"
msgstr ""
#: forum/skins/default/templates/auth/auth_settings.html:9
-msgid ""
-"These are the external authentication providers currently associated with "
-"your account."
+msgid "These are the external authentication providers currently associated with your account."
msgstr ""
#: forum/skins/default/templates/auth/auth_settings.html:12
@@ -2584,9 +2392,7 @@ msgid "remove"
msgstr ""
#: forum/skins/default/templates/auth/auth_settings.html:17
-msgid ""
-"You currently have no external authentication provider associated with your "
-"account."
+msgid "You currently have no external authentication provider associated with your account."
msgstr ""
#: forum/skins/default/templates/auth/auth_settings.html:19
@@ -2595,14 +2401,10 @@ msgstr ""
#: forum/skins/default/templates/auth/auth_settings.html:21
msgid "This is where you can change your password. Make sure you remember it!"
-msgstr ""
-"To change your password please fill out and "
-"submit this form"
+msgstr "To change your password please fill out and submit this form"
#: forum/skins/default/templates/auth/auth_settings.html:24
-msgid ""
-"You can set up a password for your account, so you can login using standard "
-"username and password!"
+msgid "You can set up a password for your account, so you can login using standard username and password!"
msgstr ""
#: forum/skins/default/templates/auth/auth_settings.html:31
@@ -2623,10 +2425,7 @@ msgid "You are here for the first time with "
msgstr ""
#: forum/skins/default/templates/auth/complete.html:13
-msgid ""
-"Please create your screen name and save your email address. Saved email "
-"address will let you subscribe for the updates on the most interesting "
-"questions and will be used to create and retrieve your unique avatar image. "
+msgid "Please create your screen name and save your email address. Saved email address will let you subscribe for the updates on the most interesting questions and will be used to create and retrieve your unique avatar image. "
msgstr ""
#: forum/skins/default/templates/auth/complete.html:15
@@ -2643,19 +2442,12 @@ msgstr "Screen Name (will be shown to others)"
#: forum/skins/default/templates/auth/complete.html:54
msgid "Email address label"
-msgstr ""
-"Email Address (will not be shared with "
-"anyone, must be valid)"
+msgstr "Email Address (will not be shared with anyone, must be valid)"
#: forum/skins/default/templates/auth/complete.html:60
#: forum/skins/default/templates/auth/signup.html:18
msgid "receive updates motivational blurb"
-msgstr ""
-"Receive forum updates by email - this will help our "
-"community grow and become more useful.
By default Q&A forum sends up to one email digest per "
-"week - only when there is anything new.
If you like, please "
-"adjust this now or any time later from your user account."
+msgstr "Receive forum updates by email - this will help our community grow and become more useful.
By default Q&A forum sends up to one email digest per week - only when there is anything new.
If you like, please adjust this now or any time later from your user account."
#: forum/skins/default/templates/auth/complete.html:64
#: forum/skins/default/templates/auth/signup.html:22
@@ -2742,13 +2534,7 @@ msgstr ""
#: forum/skins/default/templates/auth/signin.html:39
msgid "Click to sign in through any of these services."
-msgstr ""
-"
Please select your favorite login method below."
-"
External login services use OpenID technology, where your password "
-"always stays confidential between you and your login provider and you don't "
-"have to remember another one. CNPROG option requires your login name and "
-"password entered here.
"
+msgstr "Please select your favorite login method below.
External login services use OpenID technology, where your password always stays confidential between you and your login provider and you don't have to remember another one. CNPROG option requires your login name and password entered here.
"
#: forum/skins/default/templates/auth/signin.html:44
msgid "Validate my email after I login."
@@ -2780,9 +2566,7 @@ msgstr "You can safely re-use the same login for all OpenID-enabled websites."
#: forum/skins/default/templates/auth/signin.html:163
msgid "openid is widely adopted"
-msgstr ""
-"There are > 160,000,000 OpenID account in use. Over 10,000 sites are OpenID-"
-"enabled."
+msgstr "There are > 160,000,000 OpenID account in use. Over 10,000 sites are OpenID-enabled."
#: forum/skins/default/templates/auth/signin.html:166
msgid "openid is supported open standard"
@@ -2806,12 +2590,7 @@ msgstr ""
#: forum/skins/default/templates/auth/signup.html:10
msgid "Traditional signup info"
-msgstr ""
-"If you prefer, create your forum login name and "
-"password here. However, please keep in mind that we also support "
-"OpenID login method. With OpenID you can "
-"simply reuse your external login (e.g. Gmail or AOL) without ever sharing "
-"your login details with anyone and having to remember yet another password."
+msgstr "If you prefer, create your forum login name and password here. However, please keep in mind that we also support OpenID login method. With OpenID you can simply reuse your external login (e.g. Gmail or AOL) without ever sharing your login details with anyone and having to remember yet another password."
#: forum/skins/default/templates/auth/signup.html:31
msgid "Create Account"
@@ -2844,12 +2623,9 @@ msgstr ""
#: forum/skins/default/templates/auth/temp_login_request.html:8
msgid ""
"\n"
-" If you're experiencing problems accessing your account, or if you forgot "
-"your password,\n"
-" here you can request a temporary login key. Fill out your account email "
-"and we'll send you a temporary access link that\n"
-" will enable you to access your account. This token is valid only once "
-"and for a limited period of time.\n"
+" If you're experiencing problems accessing your account, or if you forgot your password,\n"
+" here you can request a temporary login key. Fill out your account email and we'll send you a temporary access link that\n"
+" will enable you to access your account. This token is valid only once and for a limited period of time.\n"
" "
msgstr ""
@@ -2904,8 +2680,7 @@ msgstr "post a comment"
#, python-format
msgid ""
"\n"
-" have characters left\n"
+" have characters left\n"
" "
msgstr ""
@@ -2943,8 +2718,7 @@ msgstr ""
#, python-format
msgid ""
"\n"
-" Just to let you know that %(accepter)s has just accepted %"
-"(answer_author)s's answer on his question\n"
+" Just to let you know that %(accepter)s has just accepted %(answer_author)s's answer on his question\n"
" %(question_title)s:\n"
" "
msgstr ""
@@ -2961,8 +2735,7 @@ msgstr ""
#, python-format
msgid ""
"\n"
-" %(nusers_count)s new user%(nusers_count_pluralize)s joined the %"
-"(app_title)s community:\n"
+" %(nusers_count)s new user%(nusers_count_pluralize)s joined the %(app_title)s community:\n"
" "
msgstr ""
@@ -2993,8 +2766,7 @@ msgstr ""
#, fuzzy, python-format
msgid ""
"\n"
-" %(comment_count)s new comment%(comment_count_pluralize)"
-"s\n"
+" %(comment_count)s new comment%(comment_count_pluralize)s\n"
" "
msgstr ""
"\n"
@@ -3065,8 +2837,7 @@ msgstr ""
#, python-format
msgid ""
"\n"
-" %(author_name)s has just posted a new answer on %(app_title)s to the "
-"question\n"
+" %(author_name)s has just posted a new answer on %(app_title)s to the question\n"
" %(question_title)s\":\n"
" "
msgstr ""
@@ -3088,15 +2859,13 @@ msgid ""
" "
msgstr ""
"\n"
-"%(q_num)s
question tagged
%(tagname)s
"
+"%(q_num)s
question tagged
%(tagname)s
"
#: forum/skins/default/templates/notifications/newcomment.html:14
#, python-format
msgid ""
"\n"
-" the answer posted by %"
-"(poster_name)s to\n"
+" the answer posted by %(poster_name)s to\n"
" "
msgstr ""
@@ -3104,8 +2873,7 @@ msgstr ""
#, python-format
msgid ""
"\n"
-" the question %"
-"(question_title)s\n"
+" the question %(question_title)s\n"
" "
msgstr ""
@@ -3113,10 +2881,8 @@ msgstr ""
#, python-format
msgid ""
"\n"
-" %(newmember_name)s has just joined %(app_title)s. You can visit %"
-"(newmember_name)s's profile using the following link:
\n"
-" %(newmember_name)s profile"
-"a>\n"
+" %(newmember_name)s has just joined %(app_title)s. You can visit %(newmember_name)s's profile using the following link:
\n"
+" %(newmember_name)s profile\n"
" "
msgstr ""
@@ -3124,10 +2890,8 @@ msgstr ""
#, python-format
msgid ""
"\n"
-" %(author_name)s has just posted a new question on %(app_title)s, "
-"with title\n"
-" %(question_title)s and "
-"tagged %(question_tags)s:\n"
+" %(author_name)s has just posted a new question on %(app_title)s, with title\n"
+" %(question_title)s and tagged %(question_tags)s:\n"
" "
msgstr ""
@@ -3169,21 +2933,15 @@ msgid "Site status"
msgstr ""
#: forum/skins/default/templates/osqaadmin/index.html:42
-msgid ""
-"Your site is running in bootstrap mode, click the button bellow to revert to "
-"defaults."
+msgid "Your site is running in bootstrap mode, click the button bellow to revert to defaults."
msgstr ""
#: forum/skins/default/templates/osqaadmin/index.html:45
-msgid ""
-"Your site is running in standard mode, click the button bellow to run in "
-"bootstrap mode."
+msgid "Your site is running in standard mode, click the button bellow to run in bootstrap mode."
msgstr ""
#: forum/skins/default/templates/osqaadmin/index.html:47
-msgid ""
-"Your site is running with some customized settings, click the buttons bellow "
-"to run with defaults or in bootstrap mode"
+msgid "Your site is running with some customized settings, click the buttons bellow to run with defaults or in bootstrap mode"
msgstr ""
#: forum/skins/default/templates/osqaadmin/index.html:51
@@ -3455,8 +3213,7 @@ msgstr[1] ""
#: forum/skins/default/templates/users/stats.html:97
#, python-format
-msgid ""
-"see other questions with %(view_user)s's contributions tagged '%(tag_name)s' "
+msgid "see other questions with %(view_user)s's contributions tagged '%(tag_name)s' "
msgstr ""
#: forum/skins/default/templates/users/stats.html:112
@@ -3475,35 +3232,26 @@ msgstr[1] ""
#: forum/skins/default/templates/users/subscriptions.html:8
#, fuzzy
msgid "Notifications and subscription settings"
-msgstr ""
-"Adjust frequency of email updates. Receive "
-"updates on interesting questions by email,
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.
Updates are only "
-"sent when there is any new activity on selected items."
+msgstr "Adjust frequency of email updates. Receive updates on interesting questions by email,
help the community by answering questions of your colleagues. If you do not wish to receive emails - select 'no email' on all items below.
Updates are only sent when there is any new activity on selected items."
#: forum/skins/default/templates/users/subscriptions.html:10
msgid ""
"\n"
-" Here you can decide which types of notifications you wish to "
-"receive, and it's frequency.
\n"
+" Here you can decide which types of notifications you wish to receive, and it's frequency.
\n"
" "
msgstr ""
#: forum/skins/default/templates/users/subscriptions.html:14
msgid ""
"\n"
-" Currently you have notifications enabled. You can always stop all "
-"notifications without loosing your settings and restart them afterwards.
\n"
+" Currently you have notifications enabled. You can always stop all notifications without loosing your settings and restart them afterwards.
\n"
" "
msgstr ""
#: forum/skins/default/templates/users/subscriptions.html:18
msgid ""
"\n"
-" Currently you have notifications disabled. You can enable them "
-"clicking on the Start notifications button bellow.
\n"
+" Currently you have notifications disabled. You can enable them clicking on the Start notifications button bellow.
\n"
" "
msgstr ""
@@ -3583,9 +3331,7 @@ msgid "More:"
msgstr ""
#: forum/skins/default/templates/users/subscriptions.html:111
-msgid ""
-"Notify me when someone replys to one of my comments on any post using the "
-"@username
notation"
+msgid "Notify me when someone replys to one of my comments on any post using the @username
notation"
msgstr ""
#: forum/skins/default/templates/users/subscriptions.html:118
@@ -3718,8 +3464,7 @@ msgid "flag"
msgstr ""
#: forum/templatetags/node_tags.py:79
-msgid ""
-"report as offensive (i.e containing spam, advertising, malicious text, etc.)"
+msgid "report as offensive (i.e containing spam, advertising, malicious text, etc.)"
msgstr ""
#: forum/templatetags/node_tags.py:82
@@ -3830,9 +3575,7 @@ msgid "All values recalculated"
msgstr ""
#: forum/views/auth.py:103 forum/views/auth.py:112
-msgid ""
-"Sorry, these login credentials belong to anoother user. Plese terminate your "
-"current session and try again."
+msgid "Sorry, these login credentials belong to anoother user. Plese terminate your current session and try again."
msgstr ""
#: forum/views/auth.py:105
@@ -3848,8 +3591,7 @@ msgid "The new credentials are now associated with your account"
msgstr ""
#: forum/views/auth.py:157
-msgid ""
-"Oops, something went wrong in the middle of this process. Please try again."
+msgid "Oops, something went wrong in the middle of this process. Please try again."
msgstr ""
#: forum/views/auth.py:219
@@ -3861,9 +3603,7 @@ msgid "An email has been sent with your temporary login key"
msgstr ""
#: forum/views/auth.py:239
-msgid ""
-"You are logged in with a temporary access key, please take the time to fix "
-"your issue with authentication."
+msgid "You are logged in with a temporary access key, please take the time to fix your issue with authentication."
msgstr ""
#: forum/views/auth.py:245
@@ -3897,8 +3637,7 @@ msgstr ""
#, python-format
msgid ""
"\n"
-" Sorry, but you don't have enough reputation points to %(action)s."
-"
\n"
+" Sorry, but you don't have enough reputation points to %(action)s.
\n"
" Please check the faq\n"
" "
msgstr ""
@@ -3917,8 +3656,7 @@ msgstr ""
msgid ""
"\n"
" Sorry but anonymous users cannot %(action)s.
\n"
-" Please login or create an account here"
-"a>.\n"
+" Please login or create an account here.\n"
" "
msgstr ""
@@ -3926,8 +3664,7 @@ msgstr ""
#, python-format
msgid ""
"\n"
-" Sorry, but you don't have enough %(action)s left for today..
\n"
+" Sorry, but you don't have enough %(action)s left for today..
\n"
" The limit is %(limit)s per day..
\n"
" Please check the faq\n"
" "
@@ -3951,9 +3688,7 @@ msgstr[1] ""
#: forum/views/commands.py:89
#, python-format
-msgid ""
-"Sorry but you cannot cancel a vote after %(ndays)d %(tdays)s from the "
-"original vote"
+msgid "Sorry but you cannot cancel a vote after %(ndays)d %(tdays)s from the original vote"
msgstr ""
#: forum/views/commands.py:90
@@ -4090,12 +3825,7 @@ msgstr ""
#: forum/views/users.py:220
#, fuzzy
msgid "subscription settings"
-msgstr ""
-"Adjust frequency of email updates. Receive "
-"updates on interesting questions by email,
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.
Updates are only "
-"sent when there is any new activity on selected items."
+msgstr "Adjust frequency of email updates. Receive updates on interesting questions by email,
help the community by answering questions of your colleagues. If you do not wish to receive emails - select 'no email' on all items below.
Updates are only sent when there is any new activity on selected items."
#: forum/views/users.py:220
#, fuzzy
@@ -4113,12 +3843,7 @@ msgstr ""
#: forum/views/users.py:239
#, fuzzy
msgid "New subscription settings are now saved"
-msgstr ""
-"Adjust frequency of email updates. Receive "
-"updates on interesting questions by email,
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.
Updates are only "
-"sent when there is any new activity on selected items."
+msgstr "Adjust frequency of email updates. Receive updates on interesting questions by email,
help the community by answering questions of your colleagues. If you do not wish to receive emails - select 'no email' on all items below.
Updates are only sent when there is any new activity on selected items."
#: forum/views/writers.py:68
msgid "uploading images is limited to users with >60 reputation points"
@@ -4135,8 +3860,7 @@ msgstr ""
#: forum/views/writers.py:74
#, python-format
-msgid ""
-"Error uploading file. Please contact the site administrator. Thank you. %s"
+msgid "Error uploading file. Please contact the site administrator. Thank you. %s"
msgstr ""
#: forum/views/writers.py:85
@@ -4234,13 +3958,7 @@ msgstr ""
#: forum_modules/default_badges/badges.py:192
#, fuzzy, python-format
msgid "Answered your own question with at least %s up votes"
-msgstr ""
-"You are welcome to answer your own question, "
-"but please make sure to give an answer. Remember that you "
-"can always revise your original question. Please "
-"use comments for discussions and please don't "
-"forget to vote :) for the answers that you liked (or perhaps did "
-"not like)! "
+msgstr "You are welcome to answer your own question, but please make sure to give an answer. Remember that you can always revise your original question. Please use comments for discussions and please don't forget to vote :) for the answers that you liked (or perhaps did not like)! "
#: forum_modules/default_badges/badges.py:205
msgid "Strunk & White"
@@ -4271,9 +3989,7 @@ msgstr ""
#: forum_modules/default_badges/badges.py:282
#, python-format
-msgid ""
-"Answered a question more than %(dif_days)s days later with at least %"
-"(up_votes)s votes"
+msgid "Answered a question more than %(dif_days)s days later with at least %(up_votes)s votes"
msgstr ""
#: forum_modules/default_badges/badges.py:295
@@ -4288,8 +4004,7 @@ msgstr ""
#: forum_modules/default_badges/settings.py:7
msgid ""
"\n"
-"Number of question views required to award a Popular Question badge to the "
-"question author\n"
+"Number of question views required to award a Popular Question badge to the question author\n"
msgstr ""
#: forum_modules/default_badges/settings.py:12
@@ -4299,8 +4014,7 @@ msgstr ""
#: forum_modules/default_badges/settings.py:13
msgid ""
"\n"
-"Number of question views required to award a Notable Question badge to the "
-"question author\n"
+"Number of question views required to award a Notable Question badge to the question author\n"
msgstr ""
#: forum_modules/default_badges/settings.py:18
@@ -4310,8 +4024,7 @@ msgstr ""
#: forum_modules/default_badges/settings.py:19
msgid ""
"\n"
-"Number of question views required to award a Famous Question badge to the "
-"question author\n"
+"Number of question views required to award a Famous Question badge to the question author\n"
msgstr ""
#: forum_modules/default_badges/settings.py:24
@@ -4321,8 +4034,7 @@ msgstr ""
#: forum_modules/default_badges/settings.py:25
msgid ""
"\n"
-"Number of up votes required to award a Nice Answer badge to the answer "
-"author\n"
+"Number of up votes required to award a Nice Answer badge to the answer author\n"
msgstr ""
#: forum_modules/default_badges/settings.py:30
@@ -4333,8 +4045,7 @@ msgstr "Tags"
#: forum_modules/default_badges/settings.py:31
msgid ""
"\n"
-"Number of up votes required to award a Nice Question badge to the question "
-"author\n"
+"Number of up votes required to award a Nice Question badge to the question author\n"
msgstr ""
#: forum_modules/default_badges/settings.py:36
@@ -4344,8 +4055,7 @@ msgstr ""
#: forum_modules/default_badges/settings.py:37
msgid ""
"\n"
-"Number of up votes required to award a Good Answer badge to the answer "
-"author\n"
+"Number of up votes required to award a Good Answer badge to the answer author\n"
msgstr ""
#: forum_modules/default_badges/settings.py:42
@@ -4356,8 +4066,7 @@ msgstr "Tags"
#: forum_modules/default_badges/settings.py:43
msgid ""
"\n"
-"Number of up votes required to award a Good Question badge to the question "
-"author\n"
+"Number of up votes required to award a Good Question badge to the question author\n"
msgstr ""
#: forum_modules/default_badges/settings.py:48
@@ -4367,8 +4076,7 @@ msgstr ""
#: forum_modules/default_badges/settings.py:49
msgid ""
"\n"
-"Number of up votes required to award a Great Answer badge to the answer "
-"author\n"
+"Number of up votes required to award a Great Answer badge to the answer author\n"
msgstr ""
#: forum_modules/default_badges/settings.py:54
@@ -4379,8 +4087,7 @@ msgstr "Tags"
#: forum_modules/default_badges/settings.py:55
msgid ""
"\n"
-"Number of up votes required to award a Great Question badge to the question "
-"author\n"
+"Number of up votes required to award a Great Question badge to the question author\n"
msgstr ""
#: forum_modules/default_badges/settings.py:60
@@ -4390,8 +4097,7 @@ msgstr ""
#: forum_modules/default_badges/settings.py:61
msgid ""
"\n"
-"How many times a question needs to be favorited by other users to award a "
-"Favorite Question badge to the question author\n"
+"How many times a question needs to be favorited by other users to award a Favorite Question badge to the question author\n"
msgstr ""
#: forum_modules/default_badges/settings.py:66
@@ -4401,8 +4107,7 @@ msgstr ""
#: forum_modules/default_badges/settings.py:67
msgid ""
"\n"
-"How many times a question needs to be favorited by other users to award a "
-"Stellar Question badge to the question author\n"
+"How many times a question needs to be favorited by other users to award a Stellar Question badge to the question author\n"
msgstr ""
#: forum_modules/default_badges/settings.py:72
@@ -4412,8 +4117,7 @@ msgstr ""
#: forum_modules/default_badges/settings.py:73
msgid ""
"\n"
-"Minimum score a question needs to have to award the Disciplined badge to an "
-"author of a question who deletes it.\n"
+"Minimum score a question needs to have to award the Disciplined badge to an author of a question who deletes it.\n"
msgstr ""
#: forum_modules/default_badges/settings.py:78
@@ -4423,8 +4127,7 @@ msgstr ""
#: forum_modules/default_badges/settings.py:79
msgid ""
"\n"
-"Maximum score a question needs to have to award the Peer Pressure badge to "
-"an author of a question who deletes it.\n"
+"Maximum score a question needs to have to award the Peer Pressure badge to an author of a question who deletes it.\n"
msgstr ""
#: forum_modules/default_badges/settings.py:84
@@ -4454,8 +4157,7 @@ msgstr ""
#: forum_modules/default_badges/settings.py:97
msgid ""
"\n"
-"Number of up votes an answer from the question author needs to have for the "
-"author to be awarded the Self Learner badge.\n"
+"Number of up votes an answer from the question author needs to have for the author to be awarded the Self Learner badge.\n"
msgstr ""
#: forum_modules/default_badges/settings.py:102
@@ -4465,8 +4167,7 @@ msgstr ""
#: forum_modules/default_badges/settings.py:103
msgid ""
"\n"
-"Number of question or answer updates an user needs to make to be awarded the "
-"Strunk & White badge.\n"
+"Number of question or answer updates an user needs to make to be awarded the Strunk & White badge.\n"
msgstr ""
#: forum_modules/default_badges/settings.py:108
@@ -4476,8 +4177,7 @@ msgstr ""
#: forum_modules/default_badges/settings.py:109
msgid ""
"\n"
-"Number of up votes an accepted answer needs to have for the author to be "
-"awarded the Enlightened badge.\n"
+"Number of up votes an accepted answer needs to have for the author to be awarded the Enlightened badge.\n"
msgstr ""
#: forum_modules/default_badges/settings.py:114
@@ -4487,8 +4187,7 @@ msgstr ""
#: forum_modules/default_badges/settings.py:115
msgid ""
"\n"
-"Number of up votes an accepted answer needs to have for the author to be "
-"awarded the Guru badge.\n"
+"Number of up votes an accepted answer needs to have for the author to be awarded the Guru badge.\n"
msgstr ""
#: forum_modules/default_badges/settings.py:120
@@ -4498,8 +4197,7 @@ msgstr ""
#: forum_modules/default_badges/settings.py:121
msgid ""
"\n"
-"Number of up votes an answer needs to have for the author to be awarded the "
-"Necromancer badge.\n"
+"Number of up votes an answer needs to have for the author to be awarded the Necromancer badge.\n"
msgstr ""
#: forum_modules/default_badges/settings.py:126
@@ -4509,8 +4207,7 @@ msgstr ""
#: forum_modules/default_badges/settings.py:127
msgid ""
"\n"
-"Difference in days betwen the posted date of a question and an answer for "
-"the answer author to be awarded the Necromancer badge.\n"
+"Difference in days betwen the posted date of a question and an answer for the answer author to be awarded the Necromancer badge.\n"
msgstr ""
#: forum_modules/default_badges/settings.py:132
@@ -4520,8 +4217,7 @@ msgstr ""
#: forum_modules/default_badges/settings.py:133
msgid ""
"\n"
-"How many usages a tag needs to have for the tag creator to be awarded the "
-"Taxonomist badge. \n"
+"How many usages a tag needs to have for the tag creator to be awarded the Taxonomist badge. \n"
msgstr ""
#: forum_modules/facebookauth/authentication.py:31
@@ -4529,14 +4225,11 @@ msgid "Sorry, your Facebook session has expired, please try again"
msgstr ""
#: forum_modules/facebookauth/authentication.py:33
-msgid ""
-"The authentication with Facebook connect failed due to an invalid signature"
+msgid "The authentication with Facebook connect failed due to an invalid signature"
msgstr ""
#: forum_modules/facebookauth/authentication.py:35
-msgid ""
-"The authentication with Facebook connect failed, cannot find authentication "
-"tokens"
+msgid "The authentication with Facebook connect failed, cannot find authentication tokens"
msgstr ""
#: forum_modules/localauth/forms.py:75
@@ -4661,24 +4354,12 @@ msgstr ""
#~ msgstr "news from Q&A forum"
#~ msgid "%(name)s, this is an update message header for a question"
-#~ msgid_plural ""
-#~ "%(name)s, this is an update message header for %(num)d questions"
-#~ msgstr[0] ""
-#~ "Dear %(name)s,
The following question has been updated on the "
-#~ "Q&A forum:"
-#~ msgstr[1] ""
-#~ "Dear %(name)s,
The following %(num)d questions have been updated "
-#~ "on the Q&A forum:
"
+#~ msgid_plural "%(name)s, this is an update message header for %(num)d questions"
+#~ msgstr[0] "Dear %(name)s,
The following question has been updated on the Q&A forum:"
+#~ msgstr[1] "Dear %(name)s,
The following %(num)d questions have been updated on the Q&A forum:
"
-#~ msgid ""
-#~ "go to %(link)s to change frequency of email updates or %(email)s "
-#~ "administrator"
-#~ msgstr ""
-#~ "Please remember that you can always adjust "
-#~ "frequency of the email updates or turn them off entirely.
If you "
-#~ "believe that this message was sent in an error, please email about it the "
-#~ "forum administrator at %(email)s.
Sincerely,
Your friendly "
-#~ "Q&A forum server.
"
+#~ msgid "go to %(link)s to change frequency of email updates or %(email)s administrator"
+#~ msgstr "Please remember that you can always adjust frequency of the email updates or turn them off entirely.
If you believe that this message was sent in an error, please email about it the forum administrator at %(email)s.
Sincerely,
Your friendly Q&A forum server.
"
#~ msgid "Account: change password"
#~ msgstr "Change your password"
@@ -4687,67 +4368,51 @@ msgstr ""
#~ msgstr "unanswered questions"
#~ msgid "Notify me once a day when there are any new answers"
-#~ msgstr ""
-#~ "Notify me once a day by email when there are any new "
-#~ "answers or updates"
+#~ msgstr "Notify me once a day by email when there are any new answers or updates"
#~ msgid "Notify me weekly when there are any new answers"
-#~ msgstr ""
-#~ "Notify me weekly when there are any new answers or "
-#~ "updates"
+#~ msgstr "Notify me weekly when there are any new answers or updates"
#~ msgid ""
#~ "\n"
-#~ " You can always adjust frequency of email updates from "
-#~ "your %(profile_url)s\n"
+#~ " You can always adjust frequency of email updates from your %(profile_url)s\n"
#~ " "
#~ msgstr ""
#~ "\n"
-#~ "(note: you can always adjust frequency of email updates)"
+#~ "(note: you can always adjust frequency of email updates)"
#~ msgid "please ask a relevant question"
#~ msgstr "ask a question relevant to the CNPROG community"
#~ msgid ""
#~ "\n"
-#~ " have total %(q_num)s questions containing %"
-#~ "(searchtitle)s in full text\n"
+#~ " have total %(q_num)s questions containing %(searchtitle)s in full text\n"
#~ " "
#~ msgid_plural ""
#~ "\n"
-#~ " have total %(q_num)s questions containing %"
-#~ "(searchtitle)s in full text\n"
+#~ " have total %(q_num)s questions containing %(searchtitle)s in full text\n"
#~ " "
#~ msgstr[0] ""
#~ "\n"
-#~ "%(q_num)s
question containing "
-#~ "%(searchtitle)s
"
+#~ "%(q_num)s
question containing %(searchtitle)s
"
#~ msgstr[1] ""
#~ "\n"
-#~ "%(q_num)s
questions containing "
-#~ "%(searchtitle)s
"
+#~ "%(q_num)s
questions containing %(searchtitle)s
"
#~ msgid ""
#~ "\n"
-#~ " have total %(q_num)s questions containing %"
-#~ "(searchtitle)s\n"
+#~ " have total %(q_num)s questions containing %(searchtitle)s\n"
#~ " "
#~ msgid_plural ""
#~ "\n"
-#~ " have total %(q_num)s questions containing %"
-#~ "(searchtitle)s\n"
+#~ " have total %(q_num)s questions containing %(searchtitle)s\n"
#~ " "
#~ msgstr[0] ""
#~ "\n"
-#~ "%(q_num)s
question with title "
-#~ "containing %(searchtitle)s"
-#~ "strong>
"
+#~ "%(q_num)s
question with title containing %(searchtitle)s
"
#~ msgstr[1] ""
#~ "\n"
-#~ "%(q_num)s
questions with title "
-#~ "containing %(searchtitle)s"
-#~ "strong>
"
+#~ "%(q_num)s
questions with title containing %(searchtitle)s
"
#~ msgid ""
#~ "\n"
@@ -4759,12 +4424,10 @@ msgstr ""
#~ " "
#~ msgstr[0] ""
#~ "\n"
-#~ "%(q_num)s
question without an "
-#~ "accepted answer
"
+#~ "%(q_num)s
question without an accepted answer
"
#~ msgstr[1] ""
#~ "\n"
-#~ "%(q_num)s
questions without an "
-#~ "accepted answer
"
+#~ "%(q_num)s
questions without an accepted answer
"
#~ msgid "latest questions info"
#~ msgstr "Newest questions are shown first."
@@ -4776,122 +4439,49 @@ msgstr ""
#~ msgstr "Stop Email"
#~ msgid "change %(email)s info"
-#~ msgstr ""
-#~ "Enter your new email into the box below "
-#~ "if you'd like to use another email for update subscriptions"
-#~ "strong>.
Currently you are using %(email)s"
+#~ msgstr "Enter your new email into the box below if you'd like to use another email for update subscriptions.
Currently you are using %(email)s"
#~ msgid "here is why email is required, see %(gravatar_faq_url)s"
-#~ msgstr ""
-#~ "Please enter your email address in the box below."
-#~ " Valid email address is required on this Q&A forum. If you "
-#~ "like, you can receive updates on interesting questions "
-#~ "or entire forum via email. Also, your email is used to create a unique gravatar image for your "
-#~ "account. Email addresses are never shown or otherwise shared with anybody "
-#~ "else."
+#~ msgstr "Please enter your email address in the box below. Valid email address is required on this Q&A forum. If you like, you can receive updates on interesting questions or entire forum via email. Also, your email is used to create a unique gravatar image for your account. Email addresses are never shown or otherwise shared with anybody else."
#~ msgid "Your Email"
-#~ msgstr ""
-#~ "Your Email (must be valid, never shown to others)"
+#~ msgstr "Your Email (must be valid, never shown to others)"
#~ msgid "validate %(email)s info or go to %(change_email_url)s"
-#~ msgstr ""
-#~ "An email with a validation link has been sent "
-#~ "to %(email)s. Please follow the emailed link with "
-#~ "your web browser. Email validation is necessary to help insure the proper "
-#~ "use of email on Q&A. If you would like "
-#~ "to use another email, please change it again."
+#~ msgstr "An email with a validation link has been sent to %(email)s. Please follow the emailed link with your web browser. Email validation is necessary to help insure the proper use of email on Q&A. If you would like to use another email, please change it again."
#~ msgid "old %(email)s kept, if you like go to %(change_email_url)s"
-#~ msgstr ""
-#~ "Your email address %(email)s has not been "
-#~ "changed. If you decide to change it later - you can always do it "
-#~ "by editing it in your user profile or by using the previous form again."
+#~ msgstr "Your email address %(email)s has not been changed. If you decide to change it later - you can always do it by editing it in your user profile or by using the previous form again."
#~ msgid "your current %(email)s can be used for this"
-#~ msgstr ""
-#~ "Your email address is now set to %(email)s."
-#~ "span> Updates on the questions that you like most will be sent to this "
-#~ "address. Email notifications are sent once a day or less frequently - "
-#~ "only when there are any news."
+#~ msgstr "Your email address is now set to %(email)s. Updates on the questions that you like most will be sent to this address. Email notifications are sent once a day or less frequently - only when there are any news."
#~ msgid "thanks for verifying email"
-#~ msgstr ""
-#~ "Thank you for verifying your email! Now "
-#~ "you can ask and answer questions. Also "
-#~ "if you find a very interesting question you can subscribe for the "
-#~ "updates - then will be notified about changes once a "
-#~ "day or less frequently."
+#~ msgstr "Thank you for verifying your email! Now you can ask and answer questions. Also if you find a very interesting question you can subscribe for the updates - then will be notified about changes once a day or less frequently."
#~ msgid "email key not sent"
#~ msgstr "Validation email not sent"
#~ msgid "email key not sent %(email)s change email here %(change_link)s"
-#~ msgstr ""
-#~ "Your current email address %(email)s has been "
-#~ "validated before so the new key was not sent. You can change email used for update subscriptions if "
-#~ "necessary."
+#~ msgstr "Your current email address %(email)s has been validated before so the new key was not sent. You can change email used for update subscriptions if necessary."
#~ msgid "register new %(provider)s account info, see %(gravatar_faq_url)s"
-#~ msgstr ""
-#~ "You are here for the first time with your %"
-#~ "(provider)s login. Please create your screen name "
-#~ "and save your email address. Saved email address will "
-#~ "let you subscribe for the updates on the most "
-#~ "interesting questions and will be used to create and retrieve your unique "
-#~ "avatar image - gravatar"
-#~ "a>.
"
+#~ msgstr "You are here for the first time with your %(provider)s login. Please create your screen name and save your email address. Saved email address will let you subscribe for the updates on the most interesting questions and will be used to create and retrieve your unique avatar image - gravatar.
"
#~ msgid ""
#~ "%(username)s already exists, choose another name for \n"
-#~ " %(provider)s. Email is required too, see %"
-#~ "(gravatar_faq_url)s\n"
+#~ " %(provider)s. Email is required too, see %(gravatar_faq_url)s\n"
#~ " "
-#~ msgstr ""
-#~ "Oops... looks like screen name %(username)s "
-#~ "is already used in another account.
Please choose another "
-#~ "screen name to use with your %(provider)s login. Also, a valid email "
-#~ "address is required on the Q&A forum. "
-#~ "Your email is used to create a unique gravatar image for your account. If you like, you "
-#~ "can receive updates on the interesting questions or "
-#~ "entire forum by email. Email addresses are never shown or otherwise "
-#~ "shared with anybody else.
"
+#~ msgstr "Oops... looks like screen name %(username)s is already used in another account.
Please choose another screen name to use with your %(provider)s login. Also, a valid email address is required on the Q&A forum. Your email is used to create a unique gravatar image for your account. If you like, you can receive updates on the interesting questions or entire forum by email. Email addresses are never shown or otherwise shared with anybody else.
"
-#~ msgid ""
-#~ "register new external %(provider)s account info, see %(gravatar_faq_url)s"
-#~ msgstr ""
-#~ "You are here for the first time with your %"
-#~ "(provider)s login.
You can either keep your screen "
-#~ "name the same as your %(provider)s login name or choose some "
-#~ "other nickname.
Also, please save a valid email "
-#~ "address. With the email you can subscribe for the updates"
-#~ "strong> on the most interesting questions. Email address is also used to "
-#~ "create and retrieve your unique avatar image - gravatar.
"
+#~ msgid "register new external %(provider)s account info, see %(gravatar_faq_url)s"
+#~ msgstr "You are here for the first time with your %(provider)s login.
You can either keep your screen name the same as your %(provider)s login name or choose some other nickname.
Also, please save a valid email address. With the email you can subscribe for the updates on the most interesting questions. Email address is also used to create and retrieve your unique avatar image - gravatar.
"
#~ msgid "register new Facebook connect account info, see %(gravatar_faq_url)s"
-#~ msgstr ""
-#~ "You are here for the first time with your "
-#~ "Facebook login. Please create your screen name "
-#~ "and save your email address. Saved email address will "
-#~ "let you subscribe for the updates on the most "
-#~ "interesting questions and will be used to create and retrieve your unique "
-#~ "avatar image - gravatar"
-#~ "a>.
"
+#~ msgstr "You are here for the first time with your Facebook login. Please create your screen name and save your email address. Saved email address will let you subscribe for the updates on the most interesting questions and will be used to create and retrieve your unique avatar image - gravatar.
"
#~ msgid "password recovery information"
-#~ msgstr ""
-#~ "Forgot you password? No problems - just get a "
-#~ "new one!
Please follow the following steps:
• submit "
-#~ "your user name below and check your email
• follow the "
-#~ "activation link for the new password - sent to you by email and "
-#~ "login with the suggested password
• at this you might want to "
-#~ "change your password to something you can remember better"
+#~ msgstr "Forgot you password? No problems - just get a new one!
Please follow the following steps:
• submit your user name below and check your email
• follow the activation link for the new password - sent to you by email and login with the suggested password
• at this you might want to change your password to something you can remember better"
#~ msgid "Reset password"
#~ msgstr "Send me a new password"
@@ -4903,60 +4493,39 @@ msgstr ""
#~ "To change your password, please follow these steps:\n"
#~ "* visit this link: %(key_link)s\n"
#~ "* login with user name %(username)s and password %(password)s\n"
-#~ "* go to your user profile and set the password to something you can "
-#~ "remember"
+#~ "* go to your user profile and set the password to something you can remember"
#~ msgid ""
#~ "\n"
-#~ " Your answer to %(title)s %(summary)s will be posted once "
-#~ "you log in\n"
+#~ " Your answer to %(title)s %(summary)s will be posted once you log in\n"
#~ " "
#~ msgstr ""
#~ "\n"
-#~ "Your answer to \"%(title)s"
-#~ "strong> %(summary)s...\" is saved and will "
-#~ "be posted once you log in."
+#~ "Your answer to \"%(title)s %(summary)s...\" is saved and will be posted once you log in."
#~ msgid ""
#~ "Your question \n"
#~ " %(title)s %(summary)s will be posted once you log in\n"
#~ " "
-#~ msgstr ""
-#~ "Your question \"%(title)s"
-#~ "strong> %(summary)s...\" is saved and will "
-#~ "be posted once you log in."
+#~ msgstr "Your question \"%(title)s %(summary)s...\" is saved and will be posted once you log in."
#~ msgid "Enter your Provider user name"
-#~ msgstr ""
-#~ "Enter your Provider user name
(or "
-#~ "select another login method above)"
+#~ msgstr "Enter your Provider user name
(or select another login method above)"
-#~ msgid ""
-#~ "Enter your OpenID "
-#~ "web address"
-#~ msgstr ""
-#~ "Enter your OpenID web address
(or choose another login method above)"
+#~ msgid "Enter your OpenID web address"
+#~ msgstr "Enter your OpenID web address
(or choose another login method above)"
#~ msgid "Enter your login name and password"
-#~ msgstr ""
-#~ "Enter your CNPROG login and password
(or select your OpenID provider above)"
+#~ msgstr "Enter your CNPROG login and password
(or select your OpenID provider above)"
#~ msgid "subscription saved, %(email)s needs validation, see %(details_url)s"
-#~ msgstr ""
-#~ "Your subscription is saved, but email address %(email)s needs to be "
-#~ "validated, please see more details here"
+#~ msgstr "Your subscription is saved, but email address %(email)s needs to be validated, please see more details here"
#~ msgid "Incorrect username."
#~ msgstr "sorry, there is no such user name"
#~ msgid "your email needs to be validated see %(details_url)s"
-#~ msgstr ""
-#~ "Your email needs to be validated. Please see details here."
+#~ msgstr "Your email needs to be validated. Please see details here."
#~ msgid "Email verification subject line"
#~ msgstr "Verification Email from Q&A forum"
@@ -4965,9 +4534,7 @@ msgstr ""
#~ msgstr "Hello and welcome to OSQA - please join us!"
#~ msgid "have %(num_q)s unanswered questions"
-#~ msgstr ""
-#~ "%(num_q)s
questions without "
-#~ "accepted answers"
+#~ msgstr "%(num_q)s
questions without accepted answers"
#~ msgid ""
#~ "\n"