Merging in changesets from revisions 809, 811, 812, 825, 826, and 827. These all...

[osqa.git] / forum / settings / accept.py

diff --git a/forum/settings/accept.py b/forum/settings/accept.py
index 4212366b1d7e836d6372aebdfbf2d3ea844c7e56..aa29e0998fbf88e192c0757a190124d2808cf7ca 100644 (file)
--- 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))