From: jordan Date: Tue, 28 Dec 2010 03:07:01 +0000 (+0000) Subject: Fixing some minor spelling mistakes, Jira-495. X-Git-Tag: live~493 X-Git-Url: https://git.openstreetmap.org./osqa.git/commitdiff_plain/fdb19c9a18ceb90295c89929282d373c24de7b6e Fixing some minor spelling mistakes, Jira-495. git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@641 0cfe37f9-358a-4d5e-be75-b63607b5c754 --- diff --git a/.pydevproject b/.pydevproject index eae2aa2..3d084be 100644 --- a/.pydevproject +++ b/.pydevproject @@ -5,7 +5,7 @@ Default python 2.6 -/osqa-pydev +/OSQA DJANGO_MANAGE_LOCATION diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..a5dea23 --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +#Tue Dec 28 03:23:44 EET 2010 +eclipse.preferences.version=1 +encoding/settings.py=utf-8 diff --git a/forum/settings/accept.py b/forum/settings/accept.py index 4212366..aa29e09 100644 --- a/forum/settings/accept.py +++ b/forum/settings/accept.py @@ -6,7 +6,7 @@ ACCEPT_SET = SettingSet('accept', _('Accepting answers'), _("Settings to tweak t DISABLE_ACCEPTING_FEATURE = Setting('DISABLE_ACCEPTING_FEATURE', False, ACCEPT_SET, dict( label = _("Disallow answers to be accepted"), -help_text = _("Disable accepting answers feature. If you reenable it in the future, currently accepted answers will still be marked as accepted."), +help_text = _("Disable accepting answers feature. If you re-enable it in the future, currently accepted answers will still be marked as accepted."), required=False)) MAXIMUM_ACCEPTED_ANSWERS = Setting('MAXIMUM_ACCEPTED_ANSWERS', 1, ACCEPT_SET, dict( @@ -19,7 +19,7 @@ help_text = _("If more than one accpeted answer is allowed, how many can be acce USERS_CAN_ACCEPT_OWN = Setting('USERS_CAN_ACCEPT_OWN', False, ACCEPT_SET, dict( label = _("Users an accept own answer"), -help_text = _("Are normal users allowed to accept theyr own answers.."), +help_text = _("Are normal users allowed to accept their own answers.."), required=False)) diff --git a/forum/settings/email.py b/forum/settings/email.py index 1a673b2..ea96940 100644 --- a/forum/settings/email.py +++ b/forum/settings/email.py @@ -37,7 +37,7 @@ required=False)) EMAIL_SUBJECT_PREFIX = Setting('EMAIL_SUBJECT_PREFIX', '', EMAIL_SET, dict( label = _("Email subject prefix"), -help_text = _("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."), +help_text = _("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 easily set up a filter on theyr email clients."), required=False)) EMAIL_FOOTER_TEXT = Setting(u'EMAIL_FOOTER_TEXT', '', EMAIL_SET, dict( diff --git a/forum/skins/default/templates/401.html b/forum/skins/default/templates/401.html index c689f53..7c1023f 100644 --- a/forum/skins/default/templates/401.html +++ b/forum/skins/default/templates/401.html @@ -31,7 +31,7 @@

{% trans "You are not logged in..." %}

- {% trans "...and the resource you're trying to access is pretocted." %} + {% trans "...and the resource you're trying to access is protected." %}

{% trans "Redirecting to the login page." %}

diff --git a/forum/skins/default/templates/auth/signin.html b/forum/skins/default/templates/auth/signin.html index 22225d2..19dee07 100644 --- a/forum/skins/default/templates/auth/signin.html +++ b/forum/skins/default/templates/auth/signin.html @@ -99,7 +99,7 @@

{% trans 'Or...' %}